Merge branch '2305-datapath-before-vhefits' into integration

Jürgen Knödlseder
2 parents 609427de 00c0acbb
Showing 6 changed files with 42 additions and 31 deletions
cscripts/csfindobs.par
cscripts/csfindobs.py
cscripts/csiactdata.par
cscripts/csiactdata.py
cscripts/csiactobs.par
cscripts/csiactobs.py
@@ -16,7 +16,7 @@
 #
 # Input and output parameters
 #============================
-datapath, s, a, $VHEFITS,,, "Path were data are located"
+datapath, s, a, NONE,,, "Path were data are located (NONE uses $VHEFITS environment variable)"
 prodname, s, a, prod-name,,, "Name of FITS production (Run csiactdata to view your options)"
 outfile,  f, a, runlist.lis,,, "Output runlist file"
  
@@ -2,7 +2,7 @@
 # ==========================================================================
 # Find observations from an IACT data store
 #
-# Copyright (C) 2016-2017 Michael Mayer
+# Copyright (C) 2016-2018 Michael Mayer
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -53,32 +53,36 @@ class csfindobs(ctools.cscript):
  
         # Return
         return
-    
+
  
     # Private methods
     def _get_parameters(self):
         """
         Get parameters from parfile and setup the observation.
         """
-        # Get parameters
-        if self._datapath == '':
-            self._datapath = self['datapath'].string()
-        
+        # Query datapath. If the parameter is not NONE then use it, otherwise
+        # use the datapath from the VHEFITS environment variable
+        datapath = self['datapath'].string()
+        if gammalib.toupper(datapath) != 'NONE':
+            self._datapath = datapath
+        else:
+            self._datapath = os.getenv('VHEFITS','')
+
         # Expand environment
         self._datapath = gammalib.expand_env(self._datapath)
-        
+
         # Get production name
         self._prodname = self['prodname'].string()
-        
+
         # Master index file name
         master_indx = self['master_indx'].string()
-        
+
         # Initialise flag if spatial selection is required
         self._select_radec = True
-        
+
         # Initialise invalid radius
         self._radius = 0.0
-        
+
         # Check for validity of spatial parameters
         if (self['ra'].is_valid() and
             self['dec'].is_valid() and 
@@ -16,7 +16,7 @@
 #
 # Input and output parameters
 #============================
-datapath,    s, a, $VHEFITS,,, "Path were data is located"
+datapath,    s, a, NONE,,, "Path were data are located (NONE uses $VHEFITS environment variable)"
 master_indx, s, h, master.json,,, "Name of master index file"
  
 #
@@ -2,7 +2,7 @@
 # ==========================================================================
 # Inspect an IACT data storage
 #
-# Copyright (C) 2015-2017 Michael Mayer
+# Copyright (C) 2015-2018 Michael Mayer
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -61,18 +61,21 @@ class csiactdata(ctools.cscript):
         """
         Get parameters from parfile and setup the observation
         """
-        
-        # Get datapath if not already set
-        if self._datapath == '':
-            self._datapath = self['datapath'].string()
-        
+        # Query datapath. If the parameter is not NONE then use it, otherwise
+        # use the datapath from the VHEFITS environment variable
+        datapath = self['datapath'].string()
+        if gammalib.toupper(datapath) != 'NONE':
+            self._datapath = datapath
+        else:
+            self._datapath = os.getenv('VHEFITS','')
+
         # Expand environment
         self._datapath = gammalib.expand_env(self._datapath)
-        
+
         # Get filename of master index file
         self._master_indx = self['master_indx'].string()
         self._master_file = os.path.join(self._datapath, self._master_indx)
-        
+
         # Check for presence of master index file
         if not os.path.isfile(self._master_file):
             raise RuntimeError('Master index file "'+self._master_file+
@@ -16,7 +16,7 @@
 #
 # Input and output parameters
 #============================
-datapath,    s, a, $VHEFITS,,, "Path were data is located"
+datapath,    s, a, NONE,,, "Path were data are located (NONE uses $VHEFITS environment variable)"
 prodname,    s, a, fits-prod-name,,, "Data storage name"
 infile,      f, a, runlist.lis,,, "Input runlist file"   
 inmodel,     f, h, NONE,,, "Input model definition XML file (optional)"
@@ -2,7 +2,7 @@
 # ==========================================================================
 # Generates an IACT observation definition XML file
 #
-# Copyright (C) 2015-2017 Michael Mayer
+# Copyright (C) 2015-2018 Michael Mayer
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -94,19 +94,23 @@ class csiactobs(ctools.cscript):
         """
         Get parameters from parfile and setup the observation
         """
-        # Set data path
-        if self._datapath == '':
-            self._datapath = self['datapath'].string()
-        
-        # Query input parameters
-        self['inmodel'].filename()
+        # Query datapath. If the parameter is not NONE then use it, otherwise
+        # use the datapath from the VHEFITS environment variable
+        datapath = self['datapath'].string()
+        if gammalib.toupper(datapath) != 'NONE':
+            self._datapath = datapath
+        else:
+            self._datapath = os.getenv('VHEFITS','')
  
         # Expand environment
         self._datapath = gammalib.expand_env(self._datapath)
-        
+
+        # Query input parameters
+        self['inmodel'].filename()
+
         # Read FITS production
         self._prodname = self['prodname'].string()
-        
+
         # Read runlist file if list not already filled
         if len(self._runlist) == 0: