Changeset 9531 for trunk

Timestamp:

12/21/09 10:06:41 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft

Files:

• Mars/Changelog (modified) (1 diff)
• Mars/mtrigger/MTriggerPatternDecode.cc (modified) (5 diffs)
• include-Classes/MMcFormat/MMcFadcHeader.hxx (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -24 +24 @@
      - allow unprescaled Calibration instead of requiring it (needed
        for MCs)
+     - changed the default for "no pattern" so that events with file
+       format <5 are correctly treated. This might result in a small 
+       bias in the case newer files miss the calibration pattern, but
+       that's unavoidable
+
+   * mtrigger/MTriggerPatternDecode.cc:
+     - decode trigger pattern for files older than format version 5
+       according to the file type
 
    * resources/calibration_spline.rc:
      - added dummy periods up to 89
+
+   * mmc/MMcFadcHeader.hxx:
+     - changed version to 10 (got a warning for newer MCs)
 
 

trunk/MagicSoft/Mars/mtrigger/MTriggerPatternDecode.cc

@@ -29 +29 @@
 //  Decodes the trigger pattern from MRawEvtData into MTriggerPattern.
 //
-// For files before file version 5 the trigger pattern is set to 00000000.
-// This can be changed using the information about the file-type.
+// For files before file version 5 the trigger pattern is set according
+// to the file type
 //
 // For more details see: MTriggerPattern
@@ -70 +70 @@
 Int_t MTriggerPatternDecode::PreProcess(MParList *pList)
 {
-    fRunHeader = (MRawRunHeader*)pList->FindCreateObj("MRawRunHeader");
+    fRunHeader = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
     if (!fRunHeader)
     {
@@ -77 +77 @@
     }
 
-    fEvtHeader = (MRawEvtHeader *)pList->FindObject("MRawEvtHeader");
+    fEvtHeader = (MRawEvtHeader*)pList->FindObject("MRawEvtHeader");
     if (!fEvtHeader)
     {
@@ -86 +86 @@
     fPattern = (MTriggerPattern*)pList->FindCreateObj("MTriggerPattern");
     if (!fPattern)
-    {
-        *fLog << err << "MRawEvtHeader not found... abort." << endl;
         return kFALSE;
-    }
 
     return kTRUE;
@@ -96 +93 @@
 // --------------------------------------------------------------------------
 //
-// For files before file version 5 the trigger pattern is set to 00000000.
-// This can be changed using the information about the file-type.
 //
 Int_t MTriggerPatternDecode::Process()
 {
-    // No setting necessary because MTriggerPattern::reset() has
-    // been called just before
     if (fRunHeader->GetFormatVersion()<5)
+    {
+        switch (fRunHeader->GetRunType()&0xff)
+        {
+        case MRawRunHeader::kRTData:
+            fPattern->fPrescaled   = MTriggerPattern::kTriggerLvl1;
+            fPattern->fUnprescaled = MTriggerPattern::kTriggerLvl1;
+            return kTRUE;
+
+        case MRawRunHeader::kRTPedestal:
+            fPattern->fPrescaled   = MTriggerPattern::kPedestal;
+            fPattern->fUnprescaled = MTriggerPattern::kPedestal;
+            return kTRUE;
+
+        case MRawRunHeader::kRTCalibration:
+            fPattern->fPrescaled   = MTriggerPattern::kCalibration;
+            fPattern->fUnprescaled = MTriggerPattern::kCalibration;
+            return kTRUE;
+        }
         return kTRUE;
+    }
 
     const UInt_t pattern = ~fEvtHeader->GetTriggerID();

trunk/MagicSoft/include-Classes/MMcFormat/MMcFadcHeader.hxx

@@ -133 +133 @@
   void   DrawPixelContent(Int_t num) const { }
 
-  ClassDef(MMcFadcHeader, 9)  //Stores Montecarlo Information describing the FADC behaviour
+  ClassDef(MMcFadcHeader, 10)  //Stores Montecarlo Information describing the FADC behaviour
 };