Simon Bonnefoy / ctools

Commit 00c0acbb422bdaaee045f0f143a146006c3f6e3a

Authored by Jürgen Knödlseder
1 parent 5670f291

Simplify datapath setting

Inline Side-by-side
Showing 6 changed files with 39 additions and 46 deletions
cscripts/csfindobs.par
  View file @00c0acb
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 # 16 #
17 # Input and output parameters 17 # Input and output parameters
18 #============================ 18 #============================
19 -datapath, s, q, NONE,,, "Path were data are located" 19 +datapath, s, a, NONE,,, "Path were data are located (NONE uses $VHEFITS environment variable)"
20 prodname, s, a, prod-name,,, "Name of FITS production (Run csiactdata to view your options)" 20 prodname, s, a, prod-name,,, "Name of FITS production (Run csiactdata to view your options)"
21 outfile, f, a, runlist.lis,,, "Output runlist file" 21 outfile, f, a, runlist.lis,,, "Output runlist file"
22 22
cscripts/csfindobs.py
  View file @00c0acb
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 # ========================================================================== 2 # ==========================================================================
3 # Find observations from an IACT data store 3 # Find observations from an IACT data store
4 # 4 #
5 -# Copyright (C) 2016-2017 Michael Mayer 5 +# Copyright (C) 2016-2018 Michael Mayer
6 # 6 #
7 # This program is free software: you can redistribute it and/or modify 7 # This program is free software: you can redistribute it and/or modify
8 # it under the terms of the GNU General Public License as published by 8 # it under the terms of the GNU General Public License as published by
@@ -53,38 +53,36 @@ class csfindobs(ctools.cscript): @@ -53,38 +53,36 @@ class csfindobs(ctools.cscript):
53 53
54 # Return 54 # Return
55 return 55 return
56 - 56 +
57 57
58 # Private methods 58 # Private methods
59 def _get_parameters(self): 59 def _get_parameters(self):
60 """ 60 """
61 Get parameters from parfile and setup the observation. 61 Get parameters from parfile and setup the observation.
62 """ 62 """
63 - # Get datapath if not already set  
64 - if self['datapath'].current_value() != 'NONE':  
65 - # Evaluate earlier user input  
66 - self._datapath = self['datapath'].current_value() 63 + # Query datapath. If the parameter is not NONE then use it, otherwise
  64 + # use the datapath from the VHEFITS environment variable
  65 + datapath = self['datapath'].string()
  66 + if gammalib.toupper(datapath) != 'NONE':
  67 + self._datapath = datapath
67 else: 68 else:
68 - if self._datapath == '':  
69 - # Query user. Mode has to be re-set from hidden to query.  
70 - self['datapath'].mode( 'q' )  
71 - self._datapath = self['datapath'].string()  
72 - 69 + self._datapath = os.getenv('VHEFITS','')
  70 +
73 # Expand environment 71 # Expand environment
74 self._datapath = gammalib.expand_env(self._datapath) 72 self._datapath = gammalib.expand_env(self._datapath)
75 - 73 +
76 # Get production name 74 # Get production name
77 self._prodname = self['prodname'].string() 75 self._prodname = self['prodname'].string()
78 - 76 +
79 # Master index file name 77 # Master index file name
80 master_indx = self['master_indx'].string() 78 master_indx = self['master_indx'].string()
81 - 79 +
82 # Initialise flag if spatial selection is required 80 # Initialise flag if spatial selection is required
83 self._select_radec = True 81 self._select_radec = True
84 - 82 +
85 # Initialise invalid radius 83 # Initialise invalid radius
86 self._radius = 0.0 84 self._radius = 0.0
87 - 85 +
88 # Check for validity of spatial parameters 86 # Check for validity of spatial parameters
89 if (self['ra'].is_valid() and 87 if (self['ra'].is_valid() and
90 self['dec'].is_valid() and 88 self['dec'].is_valid() and
cscripts/csiactdata.par
  View file @00c0acb
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 # 16 #
17 # Input and output parameters 17 # Input and output parameters
18 #============================ 18 #============================
19 -datapath, s, q, NONE,,, "Path were data is located" 19 +datapath, s, a, NONE,,, "Path were data are located (NONE uses $VHEFITS environment variable)"
20 master_indx, s, h, master.json,,, "Name of master index file" 20 master_indx, s, h, master.json,,, "Name of master index file"
21 21
22 # 22 #
cscripts/csiactdata.py
  View file @00c0acb
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 # ========================================================================== 2 # ==========================================================================
3 # Inspect an IACT data storage 3 # Inspect an IACT data storage
4 # 4 #
5 -# Copyright (C) 2015-2017 Michael Mayer 5 +# Copyright (C) 2015-2018 Michael Mayer
6 # 6 #
7 # This program is free software: you can redistribute it and/or modify 7 # This program is free software: you can redistribute it and/or modify
8 # it under the terms of the GNU General Public License as published by 8 # it under the terms of the GNU General Public License as published by
@@ -61,24 +61,21 @@ class csiactdata(ctools.cscript): @@ -61,24 +61,21 @@ class csiactdata(ctools.cscript):
61 """ 61 """
62 Get parameters from parfile and setup the observation 62 Get parameters from parfile and setup the observation
63 """ 63 """
64 -  
65 - # Set datapath if not already set  
66 - if self['datapath'].current_value() != 'NONE':  
67 - # Evaluate earlier user input  
68 - self._datapath = self['datapath'].current_value() 64 + # Query datapath. If the parameter is not NONE then use it, otherwise
  65 + # use the datapath from the VHEFITS environment variable
  66 + datapath = self['datapath'].string()
  67 + if gammalib.toupper(datapath) != 'NONE':
  68 + self._datapath = datapath
69 else: 69 else:
70 - if self._datapath == '':  
71 - # Query user. Mode has to be re-set from hidden to query.  
72 - self['datapath'].mode( 'q' )  
73 - self._datapath = self['datapath'].string()  
74 - 70 + self._datapath = os.getenv('VHEFITS','')
  71 +
75 # Expand environment 72 # Expand environment
76 self._datapath = gammalib.expand_env(self._datapath) 73 self._datapath = gammalib.expand_env(self._datapath)
77 - 74 +
78 # Get filename of master index file 75 # Get filename of master index file
79 self._master_indx = self['master_indx'].string() 76 self._master_indx = self['master_indx'].string()
80 self._master_file = os.path.join(self._datapath, self._master_indx) 77 self._master_file = os.path.join(self._datapath, self._master_indx)
81 - 78 +
82 # Check for presence of master index file 79 # Check for presence of master index file
83 if not os.path.isfile(self._master_file): 80 if not os.path.isfile(self._master_file):
84 raise RuntimeError('Master index file "'+self._master_file+ 81 raise RuntimeError('Master index file "'+self._master_file+
cscripts/csiactobs.par
  View file @00c0acb
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 # 16 #
17 # Input and output parameters 17 # Input and output parameters
18 #============================ 18 #============================
19 -datapath, s, q, NONE,,, "Path were data is located" 19 +datapath, s, a, NONE,,, "Path were data are located (NONE uses $VHEFITS environment variable)"
20 prodname, s, a, fits-prod-name,,, "Data storage name" 20 prodname, s, a, fits-prod-name,,, "Data storage name"
21 infile, f, a, runlist.lis,,, "Input runlist file" 21 infile, f, a, runlist.lis,,, "Input runlist file"
22 inmodel, f, h, NONE,,, "Input model definition XML file (optional)" 22 inmodel, f, h, NONE,,, "Input model definition XML file (optional)"
cscripts/csiactobs.py
  View file @00c0acb
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 # ========================================================================== 2 # ==========================================================================
3 # Generates an IACT observation definition XML file 3 # Generates an IACT observation definition XML file
4 # 4 #
5 -# Copyright (C) 2015-2017 Michael Mayer 5 +# Copyright (C) 2015-2018 Michael Mayer
6 # 6 #
7 # This program is free software: you can redistribute it and/or modify 7 # This program is free software: you can redistribute it and/or modify
8 # it under the terms of the GNU General Public License as published by 8 # it under the terms of the GNU General Public License as published by
@@ -94,25 +94,23 @@ class csiactobs(ctools.cscript): @@ -94,25 +94,23 @@ class csiactobs(ctools.cscript):
94 """ 94 """
95 Get parameters from parfile and setup the observation 95 Get parameters from parfile and setup the observation
96 """ 96 """
97 - # Set datapath if not already set  
98 - if self['datapath'].current_value() != 'NONE':  
99 - # Evaluate earlier user input  
100 - self._datapath = self['datapath'].current_value() 97 + # Query datapath. If the parameter is not NONE then use it, otherwise
  98 + # use the datapath from the VHEFITS environment variable
  99 + datapath = self['datapath'].string()
  100 + if gammalib.toupper(datapath) != 'NONE':
  101 + self._datapath = datapath
101 else: 102 else:
102 - if self._datapath == '':  
103 - # Query user. Mode has to be re-set from hidden to query.  
104 - self['datapath'].mode( 'q' )  
105 - self._datapath = self['datapath'].string()  
106 -  
107 - # Query input parameters  
108 - self['inmodel'].filename() 103 + self._datapath = os.getenv('VHEFITS','')
109 104
110 # Expand environment 105 # Expand environment
111 self._datapath = gammalib.expand_env(self._datapath) 106 self._datapath = gammalib.expand_env(self._datapath)
112 - 107 +
  108 + # Query input parameters
  109 + self['inmodel'].filename()
  110 +
113 # Read FITS production 111 # Read FITS production
114 self._prodname = self['prodname'].string() 112 self._prodname = self['prodname'].string()
115 - 113 +
116 # Read runlist file if list not already filled 114 # Read runlist file if list not already filled
117 if len(self._runlist) == 0: 115 if len(self._runlist) == 0:
118 116