Modifs config + progress of the A_ImgProcessor

Alain Klotz
1 parent 6bc582b5
Showing 2 changed files with 68 additions and 52 deletions Show diff stats
config/pyros_observatory/general/schemas/schema_observatory-2.0.yml
src/core/pyros_django/img_process/A_ImgProcessor.py
@@ -181,6 +181,20 @@ schema;schema_CHANNEL:
               type: str
             pathnaming:
               type: str
+        img_tmp:
+          type: map 
+          required: False
+          mapping:
+            root_dir:
+              type: str
+            description:
+              type: str
+            extension:
+              type: str 
+            naming: 
+              type: str
+            pathnaming:
+              type: str
         pyros_seq:
           type: map 
           required: False
@@ -52,11 +52,11 @@ class A_ImgProcessor(Agent):
     # TODO: Redefine valid timeout
     _AGENT_SPECIFIC_COMMANDS = {
         # Format : “cmd_name” : (timeout, exec_mode)
-                
+
         "do_create_test_images_1" : (60, Agent.EXEC_MODE.SEQUENTIAL, ''),
         "do_create_test_images_2" : (60, Agent.EXEC_MODE.SEQUENTIAL, ''),
         "do_stop_current_processing" : (60, Agent.EXEC_MODE.SEQUENTIAL, ''),
-    }    
+    }
  
     # Scenario to be executed
     # "self do_stop_current_processing"
@@ -86,24 +86,25 @@ class A_ImgProcessor(Agent):
         # === Get the config object
         self.config = self._oc['config']
         self.pconfig = self._oc['pyros_config']
-        
+
         # === Get agent_alias
         hostname = socket.gethostname()
         log.info(f"{hostname=}")
         log.info(f"{self.name=}")
         agent_alias = self.config.get_agent_real_name(self.name, hostname)
         log.info(f"{agent_alias=}")
-        
+
         # === Get self._home (str) of current unit
         self._home = self.config.getHome()
-        
+
         # === Get home (Home object) of current unit
         home = guitastro.Home(self._home)
-        
+
         # === Get the channel of agent
         channel = self.config.get_channel_of_agent(agent_alias)
         if channel == None:
             raise Exception(f"{agent_alias} has no channel file contexts {channel=}")
+        #log.info(f"{channel=}")
  
         # === Get all file contexts from the channel config
         self._fn = channel['fn_contexts']
@@ -118,19 +119,12 @@ class A_ImgProcessor(Agent):
  
         # === Copy the channel file context into the Ima object
         # --- TODO make a Filenames function to do that
-        for fcname in self._fn.fcontexts:
-            self._fn.fcontext = fcname
-            description = self._fn.fcontext_value('description')
-            self._ima.fcontext_create(fcname, description)
+        self._ima.fcontext_replace(self._fn)
+        log.info(f"=== List of file name contexts available for the channel {channel['name']} ({channel['symbol']})")
+        for fcname in self._ima.fcontexts:
             self._ima.fcontext = fcname
-            self._ima.pathnaming = self._fn.pathnaming
-            self._ima.naming = self._fn.naming
-            self._ima.pathing = self._fn.pathing
-            self._ima.rootdir = self._fn.rootdir
-            self._ima.subdir = self._fn.subdir
-            self._ima.fname = self._fn.fname
-            self._ima.extension = self._fn.extension
-        
+            log.info(f"{fcname} : {self._ima.fdescription} {self._ima.rootdir}/[{self._ima.pathing()}]/[{self._ima.naming()}]{self._ima.extension}")
+
         # === Status of routine processing
         self._routine_running = self.RUNNING_NOTHING
         log.info("Init done with success")
@@ -255,19 +249,22 @@ class A_ImgProcessor(Agent):
         """
  
         # - Get informations from the file name according the fcontext
-        infos = self._ima.pathnaming_get(fitsfile)
-        print(f"{infos}")
-        
+        log.info(f"{self._ima.fcontext} : {self._ima.fdescription} {self._ima.rootdir}/[{self._ima.pathing()}]/[{self._ima.naming()}]{self._ima.extension}")
+        infos = self._ima.naming_get(fitsfile)
+        print(f"{infos=}")
+
         # - Load file in memory
         log.info("Load the file in memory")
-        #self.set_infos("Load the file in memory")
-        f = self._ima.genename(self._ima.load(fitsfile))
-        # log.info(f"f={f}")
+        infos = self._ima.load(fitsfile)
+        print(f"{infos=}")
+        #f = self._ima.genename(self._ima.load(fitsfile))
+        #log.info(f"{f=}")
  
         # - Save as tmp
-        self._ima.path(self._paths['ima_tmp'])
+        self._ima.fcontext = "img_tmp"
+        f = self._ima.join("tmp.fit")
         log.info("Save the temporary file as tmp name")
-        self._ima.save("tmp")
+        self._ima.save(f)
  
         # - Load tmp and get infos
         self._ima.load("tmp")
@@ -333,35 +330,40 @@ class A_ImgProcessor(Agent):
     """
  
     def _create_test_images_1(self):
+        # === Define an image to test the processing and copy it in incoming directory
+        file_in = os.path.join(os.environ['PROJECT_ROOT_PATH'],"vendor","guitastro","tests","data","m57.fit")
         try:
-            # === Define an image to test the processing and copy it in incoming directory
-            file_in = os.path.join(os.environ['PROJECT_ROOT_PATH'],"vendor","guitastro","tests","data","m57.fit")
-            try:
-                self._ima.fcontext = "img_L0"
-            except Exception as e:
-                raise Exception(f"_create_test_images_1: {e}")
-            file_out = self._ima.join(file_in)
-            print(f"{file_in=}")
-            print(f"{file_out=}")
-            shutil.copyfile(file_in, file_out)
+            self._ima.fcontext = "img_L0"
         except Exception as e:
-            raise e
+            raise Exception(f"_create_test_images_1: {e}")
+        param = {}
+        param['ftype'] = "L0A"
+        param['date'] = "20000713"
+        param['time'] = "224045000000"
+        param['unit'] = "TNC"
+        param['version'] = 1
+        param['channel'] = "CH1"
+        param['id_seq'] = 123456789
+        param['plane'] = 1
+        param['frame'] = 1
+        fname = self._ima.naming_set(param)
+        file_out = self._ima.join(fname)
+        print(f"{file_in=}")
+        print(f"{file_out=}")
+        shutil.copyfile(file_in, file_out)
  
     def _create_test_images_2(self):
-        try:
-            self._ima.etc.camera("Kepler 4040")
-            self._ima.etc.optics("Takahashi_180ED")
-            self._ima.etc.params("msky",18)
-            ra = 132.84583
-            dec = 11.81333
-            at = self._ima.simulation("GAIA", "PHOTOM", shutter_mode="closed", t=50, ra=ra, dec=dec)
-            file_out = os.path.join(self._paths['ima_tmp'], "m67.ecsv")
-            print(f"STEP TOTO 1 = {at}")
-            at.t.write(file_out, format='astrotable', overwrite=True)
-            print(f"STEP TOTO 2")
-            date_obs = self.getkwd("DATE-OBS")
-        except:
-            raise
+        self._ima.etc.camera("Kepler 4040")
+        self._ima.etc.optics("Takahashi_180ED")
+        self._ima.etc.params("msky",18)
+        ra = 132.84583
+        dec = 11.81333
+        at = self._ima.simulation("GAIA", "PHOTOM", shutter_mode="closed", t=50, ra=ra, dec=dec)
+        file_out = os.path.join(self._paths['ima_tmp'], "m67.ecsv")
+        print(f"STEP TOTO 1 = {at}")
+        at.t.write(file_out, format='astrotable', overwrite=True)
+        print(f"STEP TOTO 2")
+        date_obs = self.getkwd("DATE-OBS")
  
     def _plural(self, n: int) -> str:
         """Return "s" if n>1 for plurals.
@@ -379,7 +381,7 @@ class A_ImgProcessor(Agent):
         return s
  
 if __name__ == "__main__":
-    args =  parse_args(sys.argv[1:])    
+    args =  parse_args(sys.argv[1:])
     #args = vars(parser.parse_args())
     agent = build_agent(A_ImgProcessor, param_constr=args)
     print(agent)