Changeset 3364 for trunk

Timestamp:

03/01/04 10:26:20 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• Makefile (modified) (2 diffs)
• merpp.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -4 +4 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2004/03/01: Thomas Bretz
+
+   * Makefile:
+     - enhanced all calls to subsequent makes by '-f Makefile' to
+       make sure the correct Makefile is called
+
+   * merpp.cc:
+     - enhanced interpretation of time
+     - fixed a bug in determin the file-type
+
+
+
  2004/02/27: Markus Gaug
    
-   * mjobs/MJPedestal.cc
-   * mjobs/MJCalibration.cc
-   * macros/calibration.C
-    
-     - put in call to MHCamera::Projection the name of teh calling 
+   * mjobs/MJPedestal.cc, mjobs/MJCalibration.cc, macros/calibration.C:
+     - put in call to MHCamera::Projection the name of the calling 
        class, otherwise the projected hsitogram will be overwritten by 
        an empyt one.
 
-   * mcalib/MHCalibrationChargePix.[h,cc]
-   * mcalib/MHCalibrationHiGainChargePix.[h,cc]
-   * mcalib/MHCalibrationLoGainChargePix.[h,cc]
-
+   * mcalib/MHCalibrationChargePix.[h,cc],
+     mcalib/MHCalibrationHiGainChargePix.[h,cc],
+     mcalib/MHCalibrationLoGainChargePix.[h,cc]:
      - histogram name setting and title setting moved to constructor, 
        Functions Init and ChangeHistId derive directly from 
        MHcalibrationChargePix
 
-   * mcalib/MHCalibrationChargeCam.[h,cc]
-   * mcalib/MCalibrationChargeCam.[h,cc]
-   * mcalib/MCalibrationChargeCalc.[h,cc]
-  
+   * mcalib/MHCalibrationChargeCam.[h,cc],
+     mcalib/MCalibrationChargeCam.[h,cc],
+     mcalib/MCalibrationChargeCalc.[h,cc]:
      - introduced "average inner" and "average outer" higain and logain 
        pixels.
 
 
+
  2004/02/27: Raducci Sebastian 
 
    * mhist/Makefile
      - added mastro in the include list
+
 
 
@@ -62 +71 @@
 
 
+
  2004/02/26: Hendrik Bartko
 
    * macros/dohtml.C
      - included the path msignals/
+
 
 

trunk/MagicSoft/Mars/Makefile

@@ -36 +36 @@
 #  ----->>>   mars libraries
 #
-SUBDIRS = mbase \
+SUBDIRS = slalib \
+          mbase \
           mastro \
           mmain \
@@ -111 +112 @@
 $(LIBRARIES):
         @echo " Creating lib$@:"
-        (cd $*; $(MAKE); cd ..; mv $*/$@ lib/lib$@)
+        (cd $*; $(MAKE) -f Makefile; cd ..; mv $*/$@ lib/lib$@)
 
 $(MRPROPERS):
         @echo " Doing Mr.Proper in $(@:.mrproper=)"
-        (cd $(@:.mrproper=); ($(MAKE) mrproper > /dev/null); cd ..;) 
+        (cd $(@:.mrproper=); ($(MAKE) -f Makefile mrproper > /dev/null); cd ..;) 
 
 $(CLEANERS):
         @echo "Cleaning $(@:.clean=):"
-        (cd $(@:.clean=); $(MAKE) clean; cd ..;) 
+        (cd $(@:.clean=); $(MAKE) -f Makefile clean; cd ..;) 
 
 dox: $(SOLIB)

trunk/MagicSoft/Mars/merpp.cc

@@ -85 +85 @@
     Int_t y=0, ms=0, mon=0, d=0, h=0, m=0, s=0;
 
-    if (7!=sscanf(str.Data(), "%d-%d-%d/%d:%d:%d.%d", &y, &mon, &d, &h, &m, &s, &ms))
+    const Int_t n = sscanf(str.Data(), "%d-%d-%d/%d:%d:%d.%d", &y, &mon, &d, &h, &m, &s, &ms);
+
+    if (n<6 || n>7)
+    {
+        gLog << warn << "'" << str << "' no valid Time... ignored." << endl;
         return MTime();
+    }
 
     MTime t;
@@ -122 +127 @@
     MTime kTimeStart(AnalyseTime(arg.GetStringAndRemove("--start=")));
     MTime kTimeStop(AnalyseTime(arg.GetStringAndRemove("--stop=")));
-    kTimeStart.SetName("MTimeStart");
-    kTimeStop.SetName("MTimeStop");
 
     const Int_t   kRunNumber   = arg.HasOption("--run=") ? arg.GetIntAndRemove("--run=") : -1;
@@ -150 +153 @@
     const Bool_t isreport = kNamein.EndsWith(".rep");
     const Bool_t isdc     = kNamein.EndsWith(".txt");
-    const Bool_t israw    = !isreport && !israw;
+    const Bool_t israw    = !isreport && !isdc;
 
     if (!kNamein.EndsWith(".raw") && israw)