a2p2 0.2.15__py3-none-any.whl → 0.7.4__py3-none-any.whl

a2p2/vlti/matisse.py

@@ -8,6 +8,7 @@ from a2p2.vlti.instrument import OBConstraints
 from a2p2.vlti.instrument import OBTarget
 from a2p2.vlti.instrument import TSF
 from a2p2.vlti.instrument import VltiInstrument
+import logging
 
 HELPTEXT = """
     Please define MATISSE instrument help in a2p2/vlti/matisse.py
@@ -33,68 +34,89 @@ class Matisse(VltiInstrument):
             tel = "AT"
 
         instrumentMode = instrumentConfiguration.instrumentMode
+        fringeTrackerMode = "GRA4MAT" in instrumentConfiguration.fringeTrackerMode
+        if fringeTrackerMode:
+            tsfSuffix = "_ft"
+            ui.addToLog("OB requested with GRA4MAT")
+        else:
+            tsfSuffix = ""
+            ui.addToLog("OB requested without GRA4MAT")
 
-        for observationConfiguration in ob.observationConfiguration:
+        for observationConfiguration in self.getSequence(ob):
 
             # create keywords storage objects
-            acqTSF = TSF(self, "MATISSE_img_acq.tsf")  # or .tsfx?
-            obsTSF = TSF(self, "MATISSE_hyb_obs.tsf")
+            acqTSF = TSF(self, f"MATISSE_img_acq{tsfSuffix}.tsf")  # or .tsfx?
+            obsTSF = TSF(self, f"MATISSE_hyb_obs{tsfSuffix}.tsf")
 
-            obTarget = OBTarget()
             obConstraints = OBConstraints(self)
 
             if 'SCIENCE' in observationConfiguration.type:
-                OBJTYPE = 'SCIENCE'
+                obsTSF.DPR_CATG = 'SCIENCE'  # Default OB are CALIB
             else:
-                OBJTYPE = 'CALIBRATOR'
+                obsTSF.DPR_CATG = 'CALIB'
 
             scienceTarget = observationConfiguration.SCTarget
-
-            # define target
-
-            obTarget.name = scienceTarget.name.replace(' ',
-                                                       '_')  # allowed characters: letters, digits, + - _ . and no spaces
-            # allowed characters: letters, digits, + - _ . and no spaces
-            obTarget.ra, obTarget.dec = self.getCoords(scienceTarget)
-            obTarget.properMotionRa, obTarget.properMotionDec = self.getPMCoords(
-                scienceTarget)
+            obTarget = OBTarget(self, scienceTarget)
 
             # Set baseline  interferometric array code (should be a keywordlist)
-            acqTSF.ISS_BASELINE = [self.getBaselineCode(BASELINE)]
+            acqTSF.ISS_BASELINE = [self.getBaselineCode(ob)]
+
+            self.checkIssVltiType(acqTSF)
 
             # define some default values
             VIS = 1.0  # FIXME
 
             # Retrieve Fluxes
-            COU_GS_MAG = self.getFlux(scienceTarget, "V")
-
-            # setup some default values, to be changed below
-            COU_AG_GSSOURCE = 'SCIENCE'  # by default
-            GSRA = '00:00:00.000'
-            GSDEC = '00:00:00.000'
-            dualField = False
-
-            # initialize FT variables (must exist)
-            # TODO remove next lines using a dual_acq TSF that would handle
-            # them
-
+            acqTSF.SEQ_TARG_FLUX_L = self.getFlux(scienceTarget, "L_JY")
+            acqTSF.SEQ_TARG_FLUX_N = self.getFlux(scienceTarget, "N_JY")
+            acqTSF.SEQ_TARG_MAG_K = self.getFlux(scienceTarget, "K")
+            # H is only present in _ft template
+            if fringeTrackerMode:
+                try:
+                    acqTSF.SEQ_TARG_MAG_H = self.getFlux(scienceTarget, "H")
+                except:
+                    ui.addToLog("H mag is missing. default value will be used",
+                                displayString=True, level=logging.WARNING)
+
+            # TODO : make AO & GS more consistent ( on Aspro2 side ? )
             # AO target
             aoTarget = ob.get(observationConfiguration, "AOTarget")
             if aoTarget != None:
-                AONAME = aoTarget.name
-                COU_AG_GSSOURCE = 'SETUPFILE'  # since we have an AO
+                acqTSF.COU_AG_GSSOURCE = 'SETUPFILE'  # since we have an AO
                 # TODO check if AO coords should be required by template
                 # AORA, AODEC  = self.getCoords(aoTarget,
                 # requirePrecision=False)
-                acqTSF.COU_PMA, acqTSF.COU_PMD = self.getPMCoords(aoTarget)
+                acqTSF.COU_AG_PMA, acqTSF.COU_AG_PMD = self.getPMCoords(
+                    aoTarget)
 
             # Guide Star
             gsTarget = ob.get(observationConfiguration, 'GSTarget')
             if gsTarget != None:
-                COU_GS_SOURCE = 'SETUPFILE'  # since we have an GS
-                GSRA, GSDEC = self.getCoords(gsTarget, requirePrecision=False)
-                # no PMRA, PMDE for GS !!
-                COU_GS_MAG = float(gsTarget.FLUX_V)
+                acqTSF.COU_AG_GSSOURCE = 'SETUPFILE'  # since we have a GS
+                # special hack waiting for uniform way
+                alpha, delta = self.getCoords(gsTarget, requirePrecision=False)
+                acqTSF.COU_AG_ALPHA, acqTSF.COU_AG_DELTA = alpha.replace(
+                    ":", ""), delta.replace(":", "")
+                acqTSF.COU_AG_PMA, acqTSF.COU_AG_PMD = self.getPMCoords(
+                    gsTarget)
+
+                # no PMRA, PMDE for GS ??
+
+                acqTSF.COU_GS_MAG = self.getFlux(gsTarget, "V")
+                try:
+                    if "AT" in tel:  # try better band observing on UT
+                        acqTSF.COU_GS_MAG = self.getFlux(gsTarget, "G")
+                except:
+                    ui.addToLog(
+                        "G mag can't be retreived for AT on the guide star. Use V instead")
+            else:
+                acqTSF.COU_GS_MAG = self.getFlux(scienceTarget, "V")
+                try:
+                    if "AT" in tel:  # try better band observing on UT
+                        acqTSF.COU_GS_MAG = self.getFlux(scienceTarget, "G")
+                except:
+                    ui.addToLog(
+                        "G mag can't be retreived for AT on the science star. Use V instead")
 
             # LST interval
             try:
@@ -131,47 +153,13 @@ class Matisse(VltiInstrument):
                 ui.addToLog(acqTSF, False)
                 ui.addToLog(obsTSF, False)
             else:
-                self.createMatisseOB(p2container, obTarget, obConstraints, acqTSF, obsTSF, OBJTYPE, instrumentMode,
-                                     COU_AG_GSSOURCE, GSRA, GSDEC, COU_GS_MAG, LSTINTERVAL)
-                ui.addToLog(obTarget.name + " submitted on p2")
-
-    def formatRangeTable(self):
-        rangeTable = self.getRangeTable()
-        buffer = ""
-        for l in rangeTable.keys():
-            buffer += l + "\n"
-            for k in rangeTable[l].keys():
-                constraint = rangeTable[l][k]
-                keys = constraint.keys()
-                buffer += ' %30s :' % (k)
-                if 'min' in keys and 'max' in keys:
-                    buffer += ' %f ... %f ' % (
-                        constraint['min'], constraint['max'])
-                elif 'list' in keys:
-                    buffer += str(constraint['list'])
-                elif "spaceseparatedlist" in keys:
-                    buffer += ' ' + " ".join(constraint['spaceseparatedlist'])
-                if 'default' in keys:
-                    buffer += ' (' + str(constraint['default']) + ')'
-                else:
-                    buffer += ' -no default-'
-                buffer += "\n"
-        return buffer
-
-    def getMatisseTemplateName(self, templateType, OBJTYPE):
-        objType = "calibrator"
-        if OBJTYPE and "SCI" in OBJTYPE:
-            objType = "science"
-        if OBJTYPE:
-            return "_".join((self.getShortName(), templateType, objType))
-        return "_".join((self.getShortName(), templateType))
-
-    def getMatisseObsTemplateName(self, OBJTYPE):
-        return self.getMatisseTemplateName("obs", OBJTYPE)
+                self.createOB(p2container, obTarget, obConstraints, obsTSF.DPR_CATG, instrumentMode,
+                                     LSTINTERVAL, [acqTSF, obsTSF])
 
     def formatDitTable(self):
         #    fluxTable = self.getDitTable()
-        buffer = '   Tel | Spec |  spec band  | Flux (Jy)    | tau(ms)\n'
+        buffer = ' No dit table in use \n'
+        # buffer = '   Tel | Spec |  spec band  | Flux (Jy)    | tau(ms)\n'
         #    buffer += '--------------------------------------------------------\n'
         #    for tel in ['AT']:
         #        for spec in ['Low','Med']:
@@ -186,77 +174,3 @@ class Matisse(VltiInstrument):
         #                    buffer += "\n"
 
         return buffer
-
-    def createMatisseOB(
-            self, p2container, obTarget, obConstraints, acqTSF, obsTSF, OBJTYPE, instrumentMode,
-            COU_AG_GSSOURCE, GSRA, GSDEC, COU_GS_MAG, LSTINTERVAL):
-
-        api = self.facility.getAPI()
-        ui = self.ui
-        ui.setProgress(0.1)
-
-        # TODO compute value
-        VISIBILITY = 1.0
-
-        # everything seems OK
-        # create new OB in container:
-        # TODO use a common function for next lines
-        goodName = re.sub('[^A-Za-z0-9]+', '_', obTarget.name)
-        OBS_DESCR = OBJTYPE[0:3] + '_' + goodName + '_MATISSE_' + \
-            acqTSF.ISS_BASELINE[0] + '_' + instrumentMode
-
-        ob, obVersion = api.createOB(p2container.containerId, OBS_DESCR)
-        obId = ob['obId']
-
-        # we use obId to populate OB
-        ob['obsDescription']['name'] = OBS_DESCR[0:min(len(OBS_DESCR), 31)]
-        ob['obsDescription']['userComments'] = self.getA2p2Comments()
-        # ob['obsDescription']['InstrumentComments'] = 'AO-B1-C2-E3' #should be
-        # a list of alternative quadruplets!
-
-        # copy target info
-        targetInfo = obTarget.getDict()
-        for key in targetInfo:
-            ob['target'][key] = targetInfo[key]
-
-        # copy constraints info
-        constraints = obConstraints.getDict()
-        for k in constraints:
-            ob['constraints'][k] = constraints[k]
-
-        ui.addToLog("Save ob to p2:\n%s" % ob, False)
-        ob, obVersion = api.saveOB(ob, obVersion)
-
-        # time constraints if present
-        self.saveSiderealTimeConstraints(api, obId, LSTINTERVAL)
-        ui.setProgress(0.2)
-
-        # then, attach acquisition template(s)
-        tpl, tplVersion = api.createTemplate(obId, 'MATISSE_img_acq')
-        # and put values
-        # start with acqTSF ones and complete manually missing ones
-        values = acqTSF.getDict()
-        values.update({'COU.AG.GSSOURCE': COU_AG_GSSOURCE,
-                       'COU.AG.ALPHA': GSRA,
-                       'COU.AG.DELTA': GSDEC,
-                       'COU.GS.MAG': round(COU_GS_MAG, 3),
-                       'TEL.TARG.PARALLAX': 0.0
-                       })
-
-        tpl, tplVersion = api.setTemplateParams(obId, tpl, values, tplVersion)
-        ui.setProgress(0.3)
-
-        # was :
-        # tpl, tplVersion = api.createTemplate(obId, self.getMatisseObsTemplateName(OBJTYPE))
-        tpl, tplVersion = api.createTemplate(obId, obsTSF.getP2Name())
-        ui.setProgress(0.4)
-
-        # put values. they are the same except for dual obs science (?)
-        values = obsTSF.getDict()
-        tpl, tplVersion = api.setTemplateParams(obId, tpl, values, tplVersion)
-        ui.setProgress(0.5)
-
-        # verify OB online
-        response, _ = api.verifyOB(obId, True)
-        ui.setProgress(1.0)
-        self.showP2Response(response, ob, obId)

a2p2/vlti/pionier.py

@@ -33,22 +33,22 @@ class Pionier(VltiInstrument):
 
         instrumentMode = instrumentConfiguration.instrumentMode
 
-        # Retrieve SPEC and POL info from instrumentMode
+        # Retrieve GRISM or FREE info from instrumentMode
         for disp in self.getRange("PIONIER_acq.tsf", "INS.DISP.NAME"):
             if disp in instrumentMode[0:len(disp)]:
                 ins_disp = disp
 
-        for observationConfiguration in ob.observationConfiguration:
+        for observationConfiguration in self.getSequence(ob):
 
             # create keywords storage objects
             acqTSF = TSF(self, "PIONIER_acq.tsf")
-            obsTSF = TSF(self, "PIONIER_obs_calibrator.tsf")
+
             # alias for PIONIER_obs_calibrator.tsf and
             # PIONIER_obs_science.tsf")
             kappaTSF = TSF(self, "PIONIER_gen_cal_kappa.tsf")
             darkTSF = TSF(self, "PIONIER_gen_cal_dark.tsf")
 
-            obTarget = OBTarget()
+
             obConstraints = OBConstraints(self)
 
             # set common properties
@@ -56,23 +56,19 @@ class Pionier(VltiInstrument):
 
             if 'SCIENCE' in observationConfiguration.type:
                 OBJTYPE = 'SCIENCE'
+                obsTSF = TSF(self, "PIONIER_obs_science.tsf")
             else:
                 OBJTYPE = 'CALIBRATOR'
+                obsTSF = TSF(self, "PIONIER_obs_calibrator.tsf")
 
             scienceTarget = observationConfiguration.SCTarget
 
-            # define target
-            # acqTSF.SEQ_INS_SOBJ_NAME = scienceTarget.name.strip()
-
-            acqTSF.TARGET_NAME = scienceTarget.name.strip()
-            obTarget.name = acqTSF.TARGET_NAME.replace(
-                ' ', '_')  # allowed characters: letters, digits, + - _ . and no spaces
-            obTarget.ra, obTarget.dec = self.getCoords(scienceTarget)
-            obTarget.properMotionRa, obTarget.properMotionDec = self.getPMCoords(
-                scienceTarget)
+            obTarget = OBTarget(self, scienceTarget)
 
             # Set baseline  interferometric array code (should be a keywordlist)
-            acqTSF.ISS_BASELINE = [self.getBaselineCode(BASELINE)]
+            acqTSF.ISS_BASELINE = [self.getBaselineCode(ob)]
+
+            self.checkIssVltiType(acqTSF)
 
             # define some default values
             DIAMETER = float(self.get(scienceTarget, "DIAMETER", 0.0))
@@ -108,6 +104,11 @@ class Pionier(VltiInstrument):
                 # no PMRA, PMDE for GS !!
                 TEL_COU_MAG = float(gsTarget.FLUX_V)
 
+            acqTSF.TEL_COU_GSSOURCE = TEL_COU_GSSOURCE
+            acqTSF.TEL_COU_ALPHA = GSRA
+            acqTSF.TEL_COU_DELTA = GSDEC
+            acqTSF.TEL_COU_MAG = round(TEL_COU_MAG, 3)
+
             # LST interval
             try:
                 obsConstraint = observationConfiguration.observationConstraints
@@ -123,9 +124,6 @@ class Pionier(VltiInstrument):
             else:
                 obConstraints.skyTransparency = 'Clear'
 
-            if acqTSF.ISS_IAS_HMAG > 7.5:
-                acqTSF.INS_DISP_NAME = "FREE"
-
             # FIXME: error (OB): "Phase 2 constraints must closely follow what was requested in the Phase 1 proposal.
             # The seeing value allowed for this OB is >= java0x0 arcsec."
             # FIXME REPLACE SEEING THAT IS NO MORE SUPPORTED
@@ -153,146 +151,25 @@ class Pionier(VltiInstrument):
                 ui.addToLog(kappaTSF, False)
                 ui.addToLog(darkTSF, False)
             else:
-                self.createPionierOB(p2container, obTarget, obConstraints, acqTSF,
-                                     obsTSF, kappaTSF, darkTSF, OBJTYPE, instrumentMode, TEL_COU_GSSOURCE, GSRA, GSDEC,
-                                     TEL_COU_MAG, LSTINTERVAL)
-                ui.addToLog(obTarget.name + " submitted on p2")
-
-    def formatRangeTable(self):
-        rangeTable = self.getRangeTable()
-        buffer = ""
-        for l in rangeTable.keys():
-            buffer += l + "\n"
-            for k in rangeTable[l].keys():
-                constraint = rangeTable[l][k]
-                keys = constraint.keys()
-                buffer += ' %30s :' % (k)
-                if 'min' in keys and 'max' in keys:
-                    buffer += ' %f ... %f ' % (
-                        constraint['min'], constraint['max'])
-                elif 'list' in keys:
-                    buffer += str(constraint['list'])
-                elif "spaceseparatedlist" in keys:
-                    buffer += ' ' + " ".join(constraint['spaceseparatedlist'])
-                if 'default' in keys:
-                    buffer += ' (' + str(constraint['default']) + ')'
-                else:
-                    buffer += ' -no default-'
-                buffer += "\n"
-        return buffer
+                self.createOB(p2container, obTarget, obConstraints, OBJTYPE, instrumentMode,
+                              LSTINTERVAL, [acqTSF, obsTSF, kappaTSF, darkTSF])
 
     def formatDitTable(self):
-        ditTable = self.getDitTable()
-        buffer = '   Tel | Spec |  Pol  |     H   | DIT(s)\n'
-        buffer += '--------------------------------------------------------\n'
-        for tel in ['AT']:
-            for spec in ['GRISM', 'FREE']:
-                for pol in ['IN', 'OUT']:
-                    for i in range(len(ditTable[tel][spec][pol]['DIT'])):
-                        buffer += ' %3s | %4s | %3s | %2s |' % (tel,
-                                                                spec, pol, tel)
-                        buffer += ' %4.1f <K<= %3.1f | %4.1f' % (ditTable[tel][spec][pol]['MAG'][i],
-                                                                 ditTable[tel][spec][
-                                                                     pol]['MAG'][i + 1],
-                                                                 ditTable[tel][spec][pol]['DIT'][i])
-                        buffer += "\n"
-            Hut = ditTable[tel]['Hut']
+        buffer = ' No dit table in use \n'
+
+#        ditTable = self.getDitTable()
+#        buffer = '   Tel | Spec |  Pol  |     H   | DIT(s)\n'
+#        buffer += '--------------------------------------------------------\n'
+#        for tel in ['AT']:
+#           for spec in ['GRISM', 'FREE']:
+#                for pol in ['IN', 'OUT']:
+#                    for i in range(len(ditTable[tel][spec][pol]['DIT'])):
+#                        buffer += ' %3s | %4s | %3s | %2s |' % (tel,
+#                                                                spec, pol, tel)
+#                        buffer += ' %4.1f <K<= %3.1f | %4.1f' % (ditTable[tel][spec][pol]['MAG'][i],
+#                                                                 ditTable[tel][spec][
+#                                                                     pol]['MAG'][i + 1],
+#                                                                 ditTable[tel][spec][pol]['DIT'][i])
+#                        buffer += "\n"
+#            Hut = ditTable[tel]['Hut']
         return buffer
-
-    def getPionierTemplateName(self, templateType, OBJTYPE):
-        objType = "calibrator"
-        if OBJTYPE and "SCI" in OBJTYPE:
-            objType = "science"
-        if OBJTYPE:
-            return "_".join((self.getName(), templateType, objType))
-        return "_".join((self.getName(), templateType))
-
-    def getPionierObsTemplateName(self, OBJTYPE):
-        return self.getPionierTemplateName("obs", OBJTYPE)
-
-    def createPionierOB(
-            self, p2container, obTarget, obConstraints, acqTSF, obsTSF, kappaTSF, darkTSF, OBJTYPE, instrumentMode,
-            TEL_COU_GSSOURCE, GSRA, GSDEC, TEL_COU_MAG, LSTINTERVAL):
-
-        api = self.facility.getAPI()
-        ui = self.ui
-        ui.setProgress(0.1)
-
-        # TODO compute value
-        VISIBILITY = 1.0
-
-        # everything seems OK
-        # create new OB in container:
-        # TODO use a common function for next lines
-        goodName = re.sub('[^A-Za-z0-9]+', '_', acqTSF.TARGET_NAME)
-        OBS_DESCR = OBJTYPE[0:3] + '_' + goodName + '_PIONIER_' + \
-            acqTSF.ISS_BASELINE[0] + '_' + instrumentMode
-
-        ob, obVersion = api.createOB(p2container.containerId, OBS_DESCR)
-        ui.addToLog("Getting new ob from p2: ")
-        obId = ob['obId']
-
-        # we use obId to populate OB
-        ob['obsDescription']['name'] = OBS_DESCR[0:min(len(OBS_DESCR), 31)]
-        ob['obsDescription']['userComments'] = self.getA2p2Comments()
-        # ob['obsDescription']['InstrumentComments'] = 'AO-B1-C2-E3' #should be
-        # a list of alternative quadruplets!
-
-        # copy target info
-        targetInfo = obTarget.getDict()
-        for key in targetInfo:
-            ob['target'][key] = targetInfo[key]
-
-        # copy constraints info
-        constraints = obConstraints.getDict()
-        for k in constraints:
-            ob['constraints'][k] = constraints[k]
-
-        ui.addToLog("Save ob to p2:\n%s" % ob, False)
-        ob, obVersion = api.saveOB(ob, obVersion)
-
-        # time constraints if present
-        self.saveSiderealTimeConstraints(api, obId, LSTINTERVAL)
-
-        ui.setProgress(0.2)
-
-        # then, attach acquisition template(s)
-        tpl, tplVersion = api.createTemplate(obId, 'PIONIER_acq')
-        # and put values
-        # start with acqTSF ones and complete manually missing ones
-        values = acqTSF.getDict()
-        values.update({'TEL.COU.GSSOURCE': TEL_COU_GSSOURCE,
-                       'TEL.COU.ALPHA': GSRA,
-                       'TEL.COU.DELTA': GSDEC,
-                       'TEL.COU.MAG': round(TEL_COU_MAG, 3)
-                       })
-
-        tpl, tplVersion = api.setTemplateParams(obId, tpl, values, tplVersion)
-        ui.setProgress(0.3)
-
-        # Put Obs template
-        tpl, tplVersion = api.createTemplate(
-            obId, self.getPionierObsTemplateName(OBJTYPE))
-        ui.setProgress(0.4)
-        values = obsTSF.getDict()
-        tpl, tplVersion = api.setTemplateParams(obId, tpl, values, tplVersion)
-        ui.setProgress(0.5)
-
-        # put Kappa Matrix Template
-        tpl, tplVersion = api.createTemplate(obId, 'PIONIER_gen_cal_kappa')
-        ui.setProgress(0.6)
-        values = kappaTSF.getDict()
-        tpl, tplVersion = api.setTemplateParams(obId, tpl, values, tplVersion)
-        ui.setProgress(0.7)
-
-        # put Dark Template
-        tpl, tplVersion = api.createTemplate(obId, 'PIONIER_gen_cal_dark')
-        ui.setProgress(0.8)
-        values = darkTSF.getDict()
-        tpl, tplVersion = api.setTemplateParams(obId, tpl, values, tplVersion)
-        ui.setProgress(0.9)
-
-        # verify OB online
-        response, _ = api.verifyOB(obId, True)
-        ui.setProgress(1.0)
-        self.showP2Response(response, ob, obId)

{a2p2-0.2.15.dist-info → a2p2-0.7.4.dist-info}/METADATA

@@ -1,27 +1,34 @@
 Metadata-Version: 2.1
 Name: a2p2
-Version: 0.2.15
-Summary: UNKNOWN
-Home-page: http://www.jmmc.fr/a2p2
-Author: JMMC Tech Group
-Author-email: jmmc-tech-group@jmmc.fr
+Version: 0.7.4
+Author-email: JMMC Tech Group <jmmc-tech-group@jmmc.fr>
 License: OSI Approved :: GNU General Public License v3 (GPLv3)
-Keywords: observation preparation tool optical-interferometry p2 samp
-Platform: UNKNOWN
+Project-URL: Homepage, https://www.jmmc.fr/a2p2
+Project-URL: Bug Reports, https://github.com/JMMC-OpenDev/a2p2/issues
+Project-URL: Source, https://github.com/JMMC-OpenDev/a2p2
+Keywords: observation,optical-interferometry,p2,preparation,samp,tool
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.6
-Requires-Dist: astropy (>=2)
-Requires-Dist: p2api
+Requires-Python: >=3
+Description-Content-Type: text/x-rst
+License-File: LICENSE
 Requires-Dist: appdirs
+Requires-Dist: astropy >=5.2.2
+Requires-Dist: p2api
+
+a2p2 |A2P2Badge|
+================
+
+**Move your Aspro2 observation details to an observatory proposal database.**
 
 Description
 -----------
 
 Prepare your observations within Aspro2_ ( V0.9.9.3+ ) and run a2p2_ to submit your OB.
 
-Once setup ready, select your target and use Interop Menu 
+Once setup ready, select your target and use Interop Menu
 
 CHARA OB are only displayed in the GUI for the first implementations.
 
@@ -37,18 +44,24 @@ The package is uploaded to `PyPI`_, so you can install the package (and/or upgra
 
    ``pip install --upgrade [--user] a2p2``
 
+We advice to use python environment. Prefer to use the ``--user`` option over running sudo that can break you system modules.
 
 You can also build and install from sources using git:
 
-    ``git clone https://github.com/JMMC-OpenDev/a2p2.git``
+   ``git clone https://github.com/JMMC-OpenDev/a2p2.git``
+
+   ``pip install [--user] ./a2p2``
 
-    ``pip install [--user] ./a2p2``
+or pip :
+
+   ``pip install git+https://github.com/JMMC-OpenDev/a2p2``
 
 Prerequisites
 -------------
-Some basic tests have been operated on windows, Linux and Mac OS.
+Some basic tests have been operated on windows, Linux and Mac OS. pytest-datafiles must be installed previously.
+
 
-a2p2 should launch the program. 
+a2p2 should launch the program.
 
 You may have to install some package to run tk GUI (``python-tk`` on linux).
 
@@ -63,18 +76,21 @@ optional arguments:
  -c, --createprefs                 Create preferences file
  -v, --verbose                     Verbose
 
-A GUI is provided using tkinter. 
+A GUI is provided using tkinter.
 
 Once Aspro2_ is running and a2p2_ is connected to an OB submission service (using P2API_) :
- * select your target 
- * enter the Aspro2's menu ``Interop/Send Obs. block(s) to A2p2`` 
+ * select your target
+ * enter the Aspro2's menu ``Interop/Send Obs. block(s) to A2p2``
 
 After few seconds, you shoud get a report of your new submission.
 
-Each facilities get it's own code directory to manage specific GUI and specific OB processing. You can get associated inline help in the **HELP** tab. 
+Each facilities get it's own code directory to manage specific GUI and specific OB processing. You can get associated inline help in the **HELP** tab.
 
 Please fill an issue_ for any question, remark or enhancement request.
 
+Release notes
+-------------
+`Check file <release-notes.md>`_
 
 License
 -------
@@ -105,5 +121,3 @@ Interaction diagram
 .. _a2p2:      http://www.jmmc.fr/a2p2
 .. _tutorial:  https://github.com/JMMC-OpenDev/a2p2/wiki/ASPRO2-A2P2-Tutorial
 .. _issue:     https://github.com/JMMC-OpenDev/a2p2/issues
-
-

a2p2-0.7.4.dist-info/RECORD

@@ -0,0 +1,39 @@
+a2p2/__init__.py,sha256=054S6DE3EmhAkfH5JzyiOfMJFMrIYRWt4stsfYjjGHI,297
+a2p2/__main__.py,sha256=Wu418ibC6_eM5WuvbJIi7vPALV86wAJ_iP4_zBBhTFw,2397
+a2p2/client.py,sha256=YAB4ec3OJoTob1VNGKotTdVBTMTYlW1_LdzL9CzeWyA,12413
+a2p2/facility.py,sha256=6k7RRcIL9Qr5NpCeVU3LxXNJflW8UZX6Fl3q8-V72Ik,3868
+a2p2/gui.py,sha256=gzZ31CtxsOPAA58MSL-j23dKPmTRJI16DG1Im1xMZqs,10143
+a2p2/instrument.py,sha256=JI1i8vsGu1ku_3i7my278b8y8vL5Z-SF3V8XkHPSs48,732
+a2p2/ob.py,sha256=lcSm5eXv79K6cjp0VxvxD4sSlsBTKHGbmT85XEx74lY,6268
+a2p2/samp.py,sha256=DN20lWszkuuneR1BV1MBLEyoGyN8tZWvOeC5rEVLICo,3438
+a2p2/utils.py,sha256=QEA9cpc2TaqXDa4yqrFiGkCl__1wV8--rVw_A-p_HM0,23833
+a2p2/version.py,sha256=_N6fsRiq6jonys8LHzHhDDHK23gABI2vSSLu4quaQDM,12353
+a2p2/chara/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+a2p2/chara/facility.py,sha256=otv0UVQVYD7dE_ENojjatjld5owgM9qRm7vsAc0jyqQ,2754
+a2p2/chara/gui.py,sha256=4O8u-g-UJSeqEV9CUPNflVNWIsmH0b_xf8c9huxAivs,5119
+a2p2/jmmc/__init__.py,sha256=Yx8Ae77UQA_aLMzhKgWym4m2fbMR_4m77TGfaXy6I4A,187
+a2p2/jmmc/catalogs.py,sha256=8hf8nUVfAdgROpPGzP-aD4Haulp7lWGCSHod5ZhmJNM,4801
+a2p2/jmmc/generated_models.py,sha256=69fmPfkCMBc0GyDeHp1rs0vkoPqOE4j0egMBWX5mB1U,11823
+a2p2/jmmc/models.py,sha256=ikI8Dk-9ThkG1uHtoPJwB43tPF_YZj8M5tftIcJio7s,3776
+a2p2/jmmc/services.py,sha256=kcRaRnR4COKijF5izDqqNHjKyU1j2H8PEPvbDsBUFcw,312
+a2p2/jmmc/utils.py,sha256=-LJj58klrAWTGfKt5c4o1ovX2_EntvD7HqvM-LitRbo,4585
+a2p2/jmmc/webservices.py,sha256=3jrZ8Rj542bNOvfihvGAA_8RvQgA5QQebefPJc05MRs,1568
+a2p2/vlti/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+a2p2/vlti/facility.py,sha256=kakQZg79SmSLtWNSNg3eNgdAN15NF1nTDQCLzUVzHo8,13539
+a2p2/vlti/gravity.py,sha256=yMpuDY-fV9FYmINE83Yw0Rr2VeUkCOseN8FyaTvgPvE,14408
+a2p2/vlti/gui.py,sha256=py2wlQvEIHc2--US5PogRoN-zCsgLRP71aG9_1-Vx9c,12290
+a2p2/vlti/instrument.py,sha256=g8EEVwGrihEtXcL3KaiC6nXFMH52C6wjCUb_tabTgQ8,27092
+a2p2/vlti/matisse.py,sha256=fbv1GwiEUFVeH9qe5DU2zZcVZuPc-X0Nyffwok5HaV8,7468
+a2p2/vlti/pionier.py,sha256=k_a_1bz_skzGTuQWapBqdNMFbfOIeHKI1IcKWQgVHK8,6780
+a2p2/vlti/conf/GRAVITY_ditTable.json,sha256=iBkRFp8wB91-U56wzq0v8kslVpVuQ1vYNziOo-IHayE,1602
+a2p2/vlti/conf/GRAVITY_rangeTable.json,sha256=aNB87uxxiiu0TBoXTf7OrqRiMJRnb-CFCyjSXFKvEbE,15155
+a2p2/vlti/conf/MATISSE_ditTable.json,sha256=2RQXb9UL1_VlcAAGoxqpe3nTrRfO4gyOX_IGHVy3SBc,4
+a2p2/vlti/conf/MATISSE_rangeTable.json,sha256=_j5m-EOh4bbfwdaANdh23yjgNef95AUku_uNujr9BDc,5770
+a2p2/vlti/conf/PIONIER_ditTable.json,sha256=BKK7nF0nE_LOP44l_fAvAnpG8oOq5p9srcdTNQ2udKo,857
+a2p2/vlti/conf/PIONIER_rangeTable.json,sha256=71Ycm2h-uBUVSAWy6lTpaBDOYwKKL5MuZH6F5ESHOI0,2113
+a2p2-0.7.4.dist-info/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+a2p2-0.7.4.dist-info/METADATA,sha256=igT2BELh2nCRDMYuJO5C_tgKxWS9LJWz1eBgKyHHUDA,4140
+a2p2-0.7.4.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+a2p2-0.7.4.dist-info/entry_points.txt,sha256=5Pq7faxs04hSEtjpqtBAlHw3cGUpvTmBugnS5PzgJMY,44
+a2p2-0.7.4.dist-info/top_level.txt,sha256=lLDb6xGRyHYSbrO0EUx8vNEzTiCDtPe2z7PSbqGY4kE,5
+a2p2-0.7.4.dist-info/RECORD,,

{a2p2-0.2.15.dist-info → a2p2-0.7.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.34.1)
+Generator: setuptools (75.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{a2p2-0.2.15.dist-info → a2p2-0.7.4.dist-info}/entry_points.txt

@@ -1,3 +1,2 @@
 [console_scripts]
 a2p2 = a2p2.__main__:main
-