Changeset 8970 for trunk

Timestamp:

06/17/08 18:11:57 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• mjobs/MJStar.cc (modified) (1 diff)
• mraw/MRawRunHeader.cc (modified) (1 diff)
• mraw/MRawRunHeader.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -28 +28 @@
    * mjobs/MJStar.cc:
      - Use File id instead of run number
+     - fixed the units in the display (phe not \\gamma)
 
    * mjobs/MSequence.[h,cc]:

trunk/MagicSoft/Mars/NEWS

@@ -66 +66 @@
 
    * fixed mars (event display) for merpped raw-data and MC data
+
+   * adapted the synatx of sequence files to allow for the new run/file
+     scheme. For more details see class description of MSequence
 
  ;showplot

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -218 +218 @@
 
     // ------------------ Setup histograms and fill tasks ----------------
-    MHCamEvent evt0a(0, "Cleaned",   "Average signal after Cleaning;;S [\\gamma]");
-    MHCamEvent evt0c(0, "Sparkless", "Average signal after Cleaning and Spark cuts;;S [\\gamma]");
-    MHCamEvent evt0d(0, "Sparks",    "Average signal after Cleaning for Spark cuts;;S [\\gamma]");
+    MHCamEvent evt0a(0, "Cleaned",   "Average signal after Cleaning;;S [phe]");
+    MHCamEvent evt0c(0, "Sparkless", "Average signal after Cleaning and Spark cuts;;S [phe]");
+    MHCamEvent evt0d(0, "Sparks",    "Average signal after Cleaning for Spark cuts;;S [phe]");
     MHCamEvent evt0b(0, "UsedPix",   "Fraction of Events in which Pixels are used;;Fraction");
     evt0a.SetErrorSpread(kFALSE);

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -276 +276 @@
     if (fFormatVersion>10)
     {
-        if (GetRunID()!=fTelescopeNumber && GetRunID()!=fTelescopeNumber*10U && GetRunID()!=fTelescopeNumber*10U+5U)
+        if (GetTypeID()!=fTelescopeNumber     &&
+            GetTypeID()!=fTelescopeNumber*10U &&
+            GetTypeID()!=fTelescopeNumber*10U+5U)
         {
             *fLog << err << "ERROR - Telscope number " << fTelescopeNumber << " doesn't match the first two digits of the run number " << fRunNumber << "." << endl;

trunk/MagicSoft/Mars/mraw/MRawRunHeader.h

@@ -106 +106 @@
     UInt_t   GetRunNumber() const         { return fRunNumber; }
     UInt_t   GetFileNumber() const        { return fFileNumber; }
-    UInt_t   GetRunID() const             { return (fRunNumber/1000000)%100; }
+    UInt_t   GetTypeID() const            { return (fRunNumber/1000000)%100; }
     UInt_t   GetFileID() const            { return fRunNumber>1000000?(fRunNumber%1000000)*1000+(fFileNumber%1000):fRunNumber; }
     UShort_t GetTelescopeNumber() const   { return fRunType; }
@@ -127 +127 @@
     const MTime &GetRunStart() const      { return fRunStart; }
     const MTime &GetRunEnd() const        { return fRunStop; }
-    Double_t GetRunLength() const         { return fRunStop-fRunStart; }
+    Double_t GetRunLength() const         { return !fRunStart || !fRunStop ? 0 : fRunStop-fRunStart; }
     Short_t GetPixAssignment(UShort_t i) const;
     UShort_t GetMaxPixId() const;