Francois Brun / ctools

Commit 36c07b0262fce7bd530cc5e177270a99575486f3

Authored by Jürgen Knödlseder
1 parent ead63241

Move _logFileOpen() call in execute method and make use to existing read_ahead mechanism.

Inline Side-by-side
Showing 20 changed files with 88 additions and 91 deletions
cscripts/cscaldb.py
  View file @36c07b0
... ... @@ -164,16 +164,6 @@ class cscaldb(ctools.cscript):
164 164  
165 165  
166 166 # Public methods
167   - def execute(self):
168   - """
169   - Execute the script.
170   - """
171   - # Run the script
172   - self.run()
173   -
174   - # Return
175   - return
176   -
177 167 def run(self):
178 168 """
179 169 Run the script.
... ... @@ -238,6 +228,19 @@ class cscaldb(ctools.cscript):
238 228 # Return
239 229 return
240 230  
  231 + def execute(self):
  232 + """
  233 + Execute the script.
  234 + """
  235 + # Open logfile
  236 + self._logFileOpen()
  237 +
  238 + # Run the script
  239 + self.run()
  240 +
  241 + # Return
  242 + return
  243 +
241 244  
242 245 # ======================== #
243 246 # Main routine entry point #
... ... @@ -247,8 +250,5 @@ if __name__ == '__main__':
247 250 # Create instance of application
248 251 app = cscaldb(sys.argv)
249 252  
250   - # Open logfile
251   - app._logFileOpen()
252   -
253 253 # Execute application
254 254 app.execute()
... ...
cscripts/csfindobs.py
  View file @36c07b0
... ... @@ -254,6 +254,9 @@ class csfindobs(ctools.cscript):
254 254 """
255 255 Execute the script.
256 256 """
  257 + # Open logfile
  258 + self._logFileOpen()
  259 +
257 260 # Run the script
258 261 self.run()
259 262  
... ... @@ -299,8 +302,5 @@ if __name__ == '__main__':
299 302 # Create instance of application
300 303 app = csfindobs(sys.argv)
301 304  
302   - # Open logfile
303   - app._logFileOpen()
304   -
305 305 # Execute application
306 306 app.execute()
... ...
cscripts/cslightcrv.py
  View file @36c07b0
... ... @@ -548,6 +548,9 @@ class cslightcrv(ctools.cscript):
548 548 """
549 549 Execute the script.
550 550 """
  551 + # Open logfile
  552 + self._logFileOpen()
  553 +
551 554 # Read ahead output parameters
552 555 self._read_ahead(True)
553 556  
... ... @@ -614,8 +617,5 @@ if __name__ == '__main__':
614 617 # Create instance of application
615 618 app = cslightcrv(sys.argv)
616 619  
617   - # Open logfile
618   - app._logFileOpen()
619   -
620 620 # Execute application
621 621 app.execute()
... ...
cscripts/csmodelinfo.par
  View file @36c07b0
... ... @@ -7,9 +7,9 @@
7 7 # File: csmodelinfo.par #
8 8 # Version: 1.1.0 #
9 9 # #
10   -# Author: Juergen Knoedlseder #
11   -# Jurgen.Knodlseder@irap.omp.eu #
12   -# IRAP #
  10 +# Author: Michael Mayer #
  11 +# michael.mayer@physik.hu-berlin.de #
  12 +# HU Berlin #
13 13 # #
14 14 # Purpose: Parameter file for the csmodelinfo script #
15 15 # #
... ...
cscripts/csmodelinfo.py
  View file @36c07b0
... ... @@ -59,7 +59,6 @@ class csmodelinfo(ctools.cscript):
59 59 self._show_ext_type = True
60 60 self._free_color = "green"
61 61 self._fixed_color = "magenta"
62   - self._read_ahead = False
63 62  
64 63 # Initialise application
65 64 if len(argv) == 0:
... ... @@ -106,7 +105,7 @@ class csmodelinfo(ctools.cscript):
106 105 self._fixed_color = self["fixed_color"].string()
107 106  
108 107 # Read ahead DS9 filename
109   - if self._read_ahead:
  108 + if self._read_ahead():
110 109 self._ds9file = self["ds9file"].filename()
111 110  
112 111 # Write input parameters into logger
... ... @@ -500,8 +499,11 @@ class csmodelinfo(ctools.cscript):
500 499 """
501 500 Execute the script.
502 501 """
503   - # Set read ahead flag
504   - self._read_ahead = True
  502 + # Open logfile
  503 + self._logFileOpen()
  504 +
  505 + # Read ahead output parameters
  506 + self._read_ahead(True)
505 507  
506 508 # Run the script
507 509 self.run()
... ... @@ -521,8 +523,5 @@ if __name__ == '__main__':
521 523 # Create instance of application
522 524 app = csmodelinfo(sys.argv)
523 525  
524   - # Open logfile
525   - app._logFileOpen()
526   -
527 526 # Execute application
528 527 app.execute()
... ...
cscripts/csmodelmerge.par
  View file @36c07b0
... ... @@ -7,9 +7,9 @@
7 7 # File: csmodelmerge.par #
8 8 # Version: 1.1.0 #
9 9 # #
10   -# Author: Juergen Knoedlseder #
11   -# Jurgen.Knodlseder@irap.omp.eu #
12   -# IRAP #
  10 +# Author: Michael Mayer #
  11 +# michael.mayer@physik.hu-berlin.de #
  12 +# HU Berlin #
13 13 # #
14 14 # Purpose: Parameter file for the csmodelmerge script #
15 15 # #
... ...
cscripts/csmodelmerge.py
  View file @36c07b0
... ... @@ -48,7 +48,6 @@ class csmodelmerge(ctools.cscript):
48 48 self._files = None
49 49 self._models = gammalib.GModels()
50 50 self._outmodel = "NONE"
51   - self._read_ahead = False
52 51  
53 52 # Initialise application
54 53 if len(argv) == 0:
... ... @@ -105,7 +104,7 @@ class csmodelmerge(ctools.cscript):
105 104 raise RuntimeError(msg)
106 105  
107 106 # Read ahead output filename
108   - if self._read_ahead:
  107 + if self._read_ahead():
109 108 self.outmodel = self["outmodel"].filename()
110 109  
111 110 # Write input parameters into logger
... ... @@ -196,8 +195,11 @@ class csmodelmerge(ctools.cscript):
196 195 """
197 196 Execute the script.
198 197 """
199   - # Set read ahead flag
200   - self._read_ahead = True
  198 + # Open logfile
  199 + self._logFileOpen()
  200 +
  201 + # Read ahead output parameters
  202 + self._read_ahead(True)
201 203  
202 204 # Run the script
203 205 self.run()
... ... @@ -217,8 +219,5 @@ if __name__ == '__main__':
217 219 # Create instance of application
218 220 app = csmodelmerge(sys.argv)
219 221  
220   - # Open logfile
221   - app._logFileOpen()
222   -
223 222 # Execute application
224 223 app.execute()
... ...
cscripts/csobs2caldb.par
  View file @36c07b0
... ... @@ -7,9 +7,9 @@
7 7 # File: csobs2caldb.par #
8 8 # Version: 1.1.0 #
9 9 # #
10   -# Author: Juergen Knoedlseder #
11   -# Jurgen.Knodlseder@irap.omp.eu #
12   -# IRAP #
  10 +# Author: Michael Mayer #
  11 +# michael.mayer@physik.hu-berlin.de #
  12 +# HU Berlin #
13 13 # #
14 14 # Purpose: Parameter file for the csobs2caldb script #
15 15 # #
... ...
cscripts/csobs2caldb.py
  View file @36c07b0
... ... @@ -395,6 +395,9 @@ class csobs2caldb(ctools.cscript):
395 395 """
396 396 Execute the script.
397 397 """
  398 + # Open logfile
  399 + self._logFileOpen()
  400 +
398 401 # Run the script
399 402 self.run()
400 403  
... ... @@ -413,8 +416,5 @@ if __name__ == '__main__':
413 416 # Create instance of application
414 417 app = csobs2caldb(sys.argv)
415 418  
416   - # Open logfile
417   - app._logFileOpen()
418   -
419 419 # Execute application
420 420 app.execute()
... ...
cscripts/csobsdef.py
  View file @36c07b0
... ... @@ -89,7 +89,6 @@ class csobsdef(ctools.cscript):
89 89 self._chatter = 2
90 90 self._clobber = True
91 91 self._debug = False
92   - self._read_ahead = False
93 92  
94 93 # Initialise application
95 94 if len(argv) == 0:
... ... @@ -123,7 +122,7 @@ class csobsdef(ctools.cscript):
123 122 self._inpnt = self["inpnt"].filename()
124 123  
125 124 # Read ahead parameters
126   - if self._read_ahead:
  125 + if self._read_ahead():
127 126 self._outobs = self["outobs"].filename()
128 127  
129 128 # Set some fixed parameters
... ... @@ -368,8 +367,11 @@ class csobsdef(ctools.cscript):
368 367 """
369 368 Execute the script.
370 369 """
371   - # Set read ahead flag
372   - self._read_ahead = True
  370 + # Open logfile
  371 + self._logFileOpen()
  372 +
  373 + # Read ahead output parameters
  374 + self._read_ahead(True)
373 375  
374 376 # Run the script
375 377 self.run()
... ... @@ -389,8 +391,5 @@ if __name__ == '__main__':
389 391 # Create instance of application
390 392 app = csobsdef(sys.argv)
391 393  
392   - # Open logfile
393   - app._logFileOpen()
394   -
395 394 # Execute application
396 395 app.execute()
... ...
cscripts/csobsinfo.par
  View file @36c07b0
... ... @@ -7,9 +7,9 @@
7 7 # File: csobsinfo.par #
8 8 # Version: 1.1.0 #
9 9 # #
10   -# Author: Juergen Knoedlseder #
11   -# Jurgen.Knodlseder@irap.omp.eu #
12   -# IRAP #
  10 +# Author: Michael Mayer #
  11 +# michael.mayer@physik.hu-berlin.de #
  12 +# HU Berlin #
13 13 # #
14 14 # Purpose: Parameter file for the csobsinfo script #
15 15 # #
... ...
cscripts/csobsinfo.py
  View file @36c07b0
... ... @@ -51,7 +51,8 @@ class csobsinfo(ctools.cscript):
51 51 self._pnt_dec = []
52 52 self._ebounds = gammalib.GEbounds()
53 53 self._gti = gammalib.GGti()
54   - self._read_ahead = False
  54 +
  55 + # Initialise observation
55 56 if len(argv) > 0 and isinstance(argv[0],gammalib.GObservations):
56 57 self._obs = argv[0]
57 58 argv = argv[1:]
... ... @@ -103,7 +104,7 @@ class csobsinfo(ctools.cscript):
103 104 self._obj_dir.radec_deg(ra,dec)
104 105  
105 106 # Read ahead DS9 filename
106   - if self._read_ahead:
  107 + if self._read_ahead():
107 108 self._ds9file = self["ds9file"].filename()
108 109  
109 110 # Write input parameters into logger
... ... @@ -455,8 +456,11 @@ class csobsinfo(ctools.cscript):
455 456 """
456 457 Execute the script.
457 458 """
458   - # Set read ahead flag
459   - self._read_ahead = True
  459 + # Open logfile
  460 + self._logFileOpen()
  461 +
  462 + # Read ahead output parameters
  463 + self._read_ahead(True)
460 464  
461 465 # Run the script
462 466 self.run()
... ... @@ -476,8 +480,5 @@ if __name__ == '__main__':
476 480 # Create instance of application
477 481 app = csobsinfo(sys.argv)
478 482  
479   - # Open logfile
480   - app._logFileOpen()
481   -
482 483 # Execute application
483 484 app.execute()
... ...
cscripts/cspull.py
  View file @36c07b0
... ... @@ -442,6 +442,9 @@ class cspull(ctools.cscript):
442 442 """
443 443 Execute the script.
444 444 """
  445 + # Open logfile
  446 + self._logFileOpen()
  447 +
445 448 # Run the script
446 449 self.run()
447 450  
... ... @@ -467,8 +470,5 @@ if __name__ == '__main__':
467 470 # Create instance of application
468 471 app = cspull(sys.argv)
469 472  
470   - # Open logfile
471   - app._logFileOpen()
472   -
473 473 # Execute application
474 474 app.execute()
... ...
cscripts/csresmap.par
  View file @36c07b0
... ... @@ -7,9 +7,9 @@
7 7 # File: csresmap.par #
8 8 # Version: 1.1.0 #
9 9 # #
10   -# Author: Juergen Knoedlseder #
11   -# Jurgen.Knodlseder@irap.omp.eu #
12   -# IRAP #
  10 +# Author: Michael Mayer #
  11 +# michael.mayer@physik.hu-berlin.de #
  12 +# HU Berlin #
13 13 # #
14 14 # Purpose: Parameter file for the csresmap script #
15 15 # #
... ...
cscripts/csresmap.py
  View file @36c07b0
... ... @@ -318,6 +318,9 @@ class csresmap(ctools.cscript):
318 318 """
319 319 Execute the script.
320 320 """
  321 + # Open logfile
  322 + self._logFileOpen()
  323 +
321 324 # Read ahead output parameters
322 325 self._read_ahead(True)
323 326  
... ... @@ -405,8 +408,5 @@ if __name__ == '__main__':
405 408 # Create instance of application
406 409 app = csresmap(sys.argv)
407 410  
408   - # Open logfile
409   - app._logFileOpen()
410   -
411 411 # Execute application
412 412 app.execute()
... ...
cscripts/cssens.py
  View file @36c07b0
... ... @@ -734,6 +734,9 @@ class cssens(ctools.cscript):
734 734 """
735 735 Execute the script.
736 736 """
  737 + # Open logfile
  738 + self._logFileOpen()
  739 +
737 740 # Run the script
738 741 self.run()
739 742  
... ... @@ -750,8 +753,5 @@ if __name__ == '__main__':
750 753 # Create instance of application
751 754 app = cssens(sys.argv)
752 755  
753   - # Open logfile
754   - app._logFileOpen()
755   -
756 756 # Run application
757 757 app.execute()
... ...
cscripts/csspec.py
  View file @36c07b0
... ... @@ -132,7 +132,7 @@ class csspec(ctools.cscript):
132 132 self._debug = self["debug"].boolean()
133 133  
134 134 # Read ahead output parameters
135   - if (self._read_ahead()):
  135 + if self._read_ahead():
136 136 self._outfile = self["outfile"].filename()
137 137  
138 138 # Write input parameters into logger
... ... @@ -494,6 +494,9 @@ class csspec(ctools.cscript):
494 494 """
495 495 Execute the script.
496 496 """
  497 + # Open logfile
  498 + self._logFileOpen()
  499 +
497 500 # Read ahead output parameters
498 501 self._read_ahead(True)
499 502  
... ... @@ -560,8 +563,5 @@ if __name__ == '__main__':
560 563 # Create instance of application
561 564 app = csspec(sys.argv)
562 565  
563   - # Open logfile
564   - app._logFileOpen()
565   -
566 566 # Execute application
567 567 app.execute()
... ...
cscripts/cstsdist.py
  View file @36c07b0
... ... @@ -463,6 +463,9 @@ class cstsdist(ctools.cscript):
463 463 """
464 464 Execute the script.
465 465 """
  466 + # Open logfile
  467 + self._logFileOpen()
  468 +
466 469 # Run the script
467 470 self.run()
468 471  
... ... @@ -478,8 +481,5 @@ if __name__ == '__main__':
478 481 # Create instance of application
479 482 app = cstsdist(sys.argv)
480 483  
481   - # Open logfile
482   - app._logFileOpen()
483   -
484 484 # Execute application
485 485 app.execute()
... ...
cscripts/cstsmapmerge.par
  View file @36c07b0
... ... @@ -7,9 +7,9 @@
7 7 # File: cstsmapmerge.par #
8 8 # Version: 1.1.0 #
9 9 # #
10   -# Author: Juergen Knoedlseder #
11   -# Jurgen.Knodlseder@irap.omp.eu #
12   -# IRAP #
  10 +# Author: Michael Mayer #
  11 +# michael.mayer@physik.hu-berlin.de #
  12 +# HU Berlin #
13 13 # #
14 14 # Purpose: Parameter file for the cstsmapmerge script #
15 15 # #
... ...
cscripts/cstsmapmerge.py
  View file @36c07b0
... ... @@ -53,7 +53,6 @@ class cstsmapmerge(ctools.cscript):
53 53 self._overwrite = True
54 54 self._delete = False
55 55 self._outmap = "NONE"
56   - self._read_ahead = False
57 56  
58 57 # Initialise application
59 58 if len(argv) == 0:
... ... @@ -120,7 +119,7 @@ class cstsmapmerge(ctools.cscript):
120 119 self._delete = self["delete"].boolean()
121 120  
122 121 # Read ahead output filename
123   - if self._read_ahead:
  122 + if self._read_ahead():
124 123 self._outmap = self["outmap"].filename()
125 124  
126 125 # Write input parameters into logger
... ... @@ -444,8 +443,11 @@ class cstsmapmerge(ctools.cscript):
444 443 """
445 444 Execute the script.
446 445 """
447   - # Set read ahead flag
448   - self._read_ahead = True
  446 + # Open logfile
  447 + self._logFileOpen()
  448 +
  449 + # Read ahead output parameters
  450 + self._read_ahead(True)
449 451  
450 452 # Run the script
451 453 self.run()
... ... @@ -465,8 +467,5 @@ if __name__ == '__main__':
465 467 # Create instance of application
466 468 app = cstsmapmerge(sys.argv)
467 469  
468   - # Open logfile
469   - app._logFileOpen()
470   -
471 470 # Execute application
472 471 app.execute()
... ...