Changeset 2984

Timestamp:

01/30/04 14:55:59 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mbase/MStatusDisplay.cc (modified) (2 diffs)
• mfileio/MReadMarsFile.cc (modified) (5 diffs)
• mfilter/MFilterList.cc (modified) (1 diff)
• mraw/MRawFileRead.cc (modified) (1 diff)
• mraw/MRawRunHeader.cc (modified) (2 diffs)
• mraw/MRawRunHeader.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
        calibrated pixel information.
 
+
+
  2004/01/30: Thomas Bretz
  
@@ -26 +28 @@
      - added a dynamic_cast from MParContainer to MCamEvent to get the
        correct pointer to the correct base-class.
+
+   * mbase/MStatusDisplay.cc:
+     - In EventInfo check whether gPad==0
+     
+   * mfileio/MReadMarsFile.cc:
+     - removed reading RunHeaders from PreProcess, this resulted
+       in strange behaviour of writing RunHeaders
+     - fixed consistency check for RunType accordingly
+
+   * mfilter/MFilterList.cc:
+     - do not skip adding filter if only a filter with the same name 
+       exists
+       
+   * mraw/MRawFileRead.cc:
+     - added an output message if run header is not accessible
+     
+   * mraw/MRawRunHeader.[h,cc]:
+     - initialize fRunType to new enum kRTNone
 
 

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -532 +532 @@
     if (gROOT->IsBatch())
         return;
+
     fStatusBar->SetText(txt, 1);
 
@@ -816 +817 @@
         return;
 
-    TCanvas *c = (TCanvas *)gTQSender;
+    TCanvas *c = (TCanvas*)gTQSender;
 
     TVirtualPad* save=gPad;
 
-    gPad = c->GetSelectedPad();
-
-    SetStatusLine2(selected->GetObjectInfo(px,py));
+    gPad = c ? c->GetSelectedPad() : NULL;
+
+    if (gPad)
+        SetStatusLine2(selected->GetObjectInfo(px,py));
 
     gPad=save;

trunk/MagicSoft/Mars/mfileio/MReadMarsFile.cc

@@ -124 +124 @@
 Bool_t MReadMarsFile::Notify()
 {
-    Int_t runtype = -1;
+    UInt_t runtype = 0xffff;
 
     const MRawRunHeader *rawheader = (MRawRunHeader*)fParList->FindObject("MRawRunHeader");
@@ -145 +145 @@
     if (!MReadTree::Notify())
         return kFALSE;
+
+    if (rawheader && runtype!=0xffff && runtype != rawheader->GetRunType())
+    {
+        *fLog << warn << "Warning - You are mixing files with different run types (";
+        *fLog << runtype << ", " << rawheader->GetRunType() << ")" << endl;
+    }
 
     if (fDisplay)
@@ -152 +158 @@
         txt += GetNumEntry()-1;
         fDisplay->SetStatusLine2(txt);
-    }
-
-    if (rawheader)
-    {
-        if (runtype != rawheader->GetRunType())
-            *fLog << warn << "Warning - You are mixing files with different run types!" << endl;
     }
 
@@ -209 +209 @@
     }
 
+    /*
     const Int_t idx = GetFileIndex();
     fRun->SetEventNum(idx<0?0:idx); // Assumption: One Entry per File!
@@ -216 +217 @@
         return kFALSE;
     }
-
+    */
     return MReadTree::PreProcess(pList);
 }

trunk/MagicSoft/Mars/mfilter/MFilterList.cc

@@ -188 +188 @@
 
     if (fFilters.FindObject(name))
-    {
         *fLog << warn << dbginf << "'" << name << "' exists in List already... skipped." << endl;
-        return kTRUE;
-    }
 
     *fLog << inf << "Adding " << name << " to " << GetName() << "... " << flush;

trunk/MagicSoft/Mars/mraw/MRawFileRead.cc

@@ -149 +149 @@
     //
     fRawRunHeader->ReadEvt(*fIn);
+    if (!(*fIn))
+    {
+        *fLog << err << "Error: Accessing file '" << fFileName << "'" << endl;
+        return kFALSE;
+    }
+    if (fRawRunHeader->GetMagicNumber()!=kMagicNumber)
+        return kFALSE;
+
     fRawRunHeader->Print();
-
-    if (fRawRunHeader->GetMagicNumber()!=kMagicNumber)
-        return kFALSE;
 
     *fRawEvtTime = fRawRunHeader->GetRunStart();

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -75 +75 @@
     fFormatVersion=0;
     fSoftVersion=0;
-    fRunType=0;
+    fRunType=kRTNone;  // use 0xffff for invalidation, 0 means: Data run
     fRunNumber=0;
     fProjectName[0]=0;
@@ -184 +184 @@
     case kRTMonteCarlo:
         return "Monte Carlo";
+    case kRTNone:
+        return "<none>";
     default:
         return "<unknown>";

trunk/MagicSoft/Mars/mraw/MRawRunHeader.h

@@ -24 +24 @@
 //
 enum {
-    kRTData        = 0,
-    kRTPedestal    = 1,
-    kRTCalibration = 2,
-    kRTMonteCarlo  = 256
+    kRTData        = 0x0000,
+    kRTPedestal    = 0x0001,
+    kRTCalibration = 0x0002,
+    kRTMonteCarlo  = 0x0100,
+    kRTNone        = 0xffff
 };