Minor updates on the makefile and the logging in csobsinfo

Michael Mayer
1 parent b4dcdf64
Showing 2 changed files with 16 additions and 9 deletions
cscripts/Makefile.am
cscripts/csobsinfo.py
 ## Process this file with automake to produce Makefile.in
  
 # Scripts to be distributed in bindir
-binscripts = tsmerge.py
+binscripts = tsmerge.py modelmerge.py
  
 # Scripts to be distributed in $(pyexecdir)/cscripts
 pythonscripts = __init__.py \
                 cspull.py cssens.py cstsdist.py cscaldb.py csresmap.py \
-                cshessobs.py csobsdef.py csspec.py cslightcrv.py \
+                cshessobs.py csobsdef.py csspec.py cslightcrv.py csobsinfo.py \
                 csinfo.py \
                 obsutils.py
  
 # Scripts for which symbolic links will be created in bindir
 linkscripts = cspull cssens cstsdist cscaldb csresmap \
-              cshessobs csobsdef csspec cslightcrv \
+              cshessobs csobsdef csspec cslightcrv csobsinfo \
               csinfo
  
 # Distribute scripts
@@ -160,17 +160,24 @@ class csobsinfo(ctools.cscript):
         # Loop over observations
         for obs in self.obs:
  
-            # Logging
-            if self.logTerse():
-                self.log.header2(obs.name())
-            
+
             # Skip non-CTA observations
             if not obs.classname() == "GCTAObservation":
                 self.log("Skipping "+obs.instrument()+" observation\n")
                 continue 
  
+            # Use observed object as observation name
+            # if name is not given
+            obs_name = obs.name()
+            if obs_name == "":
+                obs_name = obs.object()
+            
+            # Logging
+            if self.logTerse():
+                self.log.header2(obs_name)
+                
             # Retrieve observation name
-            obs_names.append(obs.name())
+            obs_names.append(obs_name)
  
             # Retrieve energy boundaries
             obs_bounds = obs.events().ebounds()
@@ -309,7 +316,7 @@ class csobsinfo(ctools.cscript):
  
         # Log mean offset if possible
         if self.m_offset:
-            self.log.parformat("Mean offset")
+            self.log.parformat("Mean offset angle")
             self.log("%.2f"%(sum(self.offsets)/len(self.offsets)))
             self.log("\n")