Changeset 1542 for trunk/MagicSoft/Mars

Timestamp:

10/16/02 10:40:39 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/readMagic.C (modified) (2 diffs)
• manalysis/MHillasCalc.cc (modified) (1 diff)
• manalysis/MHillasSrcCalc.cc (modified) (1 diff)
• mbase/MPrint.cc (modified) (3 diffs)
• mbase/MPrint.h (modified) (2 diffs)
• mbase/MTaskList.cc (modified) (1 diff)
• meventdisp/MGEvtDisplay.cc (modified) (2 diffs)
• mraw/MRawEvtHeader.cc (modified) (1 diff)
• mraw/MRawEvtHeader.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+ 2002/10/16: Thomas Bretz
+
+   * macros/readMagic.C:
+     - added MPrint for MRawEvtHeader
+     - changed to MPrint to new Skip-Style
+
+   * manalysis/MHillasCalc.cc, manalysis/MHillasSrcCalc.cc:
+     - corrected output stream in case of hex or setfill was used
+
+   * mbase/MPrint.[h,cc]:
+     - introduced new behaviour of PreProcess (EnableSkip)
+
+   * mbase/MTaskList.cc:
+     - fixed a bug in Process which caused Histograms to be written
+       after each event
+
+   * meventdisp/MGEvtDisplay.cc:
+     - introduced printing of MRawEvtHeader
+
+   * mmc/MMcEvt.cxx:
+     - some small changes
+     - changed Print output from cout to fLog
+     - changes to the default values
+
+   * mraw/MRawEvtHeader.[h,cc]:
+     - removed the second empty line after Print
+     - added Getter-function for the DAQEvtNumber
+
+
+
  2002/10/15: Thomas Bretz
 

trunk/MagicSoft/Mars/macros/readMagic.C

@@ -58 +58 @@
     plist.AddToList(&tlist);
 
-    MReadMarsFile     read("Events", fname);
+    MReadMarsFile read("Events", fname);
     read.DisableAutoScheme();
 
-    MPrint            print("MMcEvt");
+    MPrint print1("MMcEvt");
+    MPrint print2("MRawEvtHeader");
+    print1.EnableSkip();
+    print2.EnableSkip();
+
     MMcPedestalCopy   pcopy;
     MMcPedestalNSBAdd pnsb;
@@ -73 +77 @@
 
     tlist.AddToList(&read);
-    tlist.AddToList(&print);
+    tlist.AddToList(&print1);
+    tlist.AddToList(&print2);
     tlist.AddToList(&pcopy);
     tlist.AddToList(&pnsb);

trunk/MagicSoft/Mars/manalysis/MHillasCalc.cc

@@ -125 +125 @@
     *fLog << inf << endl;
     *fLog << GetDescriptor() << " execution statistics:" << endl;
+    *fLog << dec << setfill(' ');
     *fLog << " " << setw(7) << fErrors[1] << " (" << setw(3) << (int)(fErrors[1]*100/GetNumExecutions()) << "%) Evts skipped due to: Event has less than 3 pixels" << endl;
     *fLog << " " << setw(7) << fErrors[2] << " (" << setw(3) << (int)(fErrors[2]*100/GetNumExecutions()) << "%) Evts skipped due to: Calculated Size == 0" << endl;

trunk/MagicSoft/Mars/manalysis/MHillasSrcCalc.cc

@@ -122 +122 @@
     *fLog << inf << endl;
     *fLog << GetDescriptor() << " execution statistics:" << endl;
+    *fLog << dec << setfill(' ');
     *fLog << " " << fErrors << " (" << (int)(fErrors*100/GetNumExecutions()) << "%) Evts skipped due to: Dist==0" << endl;
     *fLog << endl;

trunk/MagicSoft/Mars/mbase/MPrint.cc

@@ -67 +67 @@
 //  must be overloaded. You can also set an option string to use
 //  when calling TObject::Print
+//  If you want that the MPrint instance is removed from the tasklist
+//  if the container to be printed is not found in the PreProcess, call:
+//     MPrint::EnableSkip();
 //
 MPrint::MPrint(const char *obj, const char *option,
@@ -84 +87 @@
 //  must be overloaded. You can also set an option string to use
 //  when calling TObject::Print
+//  if the container to be printed is not found in the PreProcess, call:
+//     MPrint::EnableSkip();
 //
 MPrint::MPrint(const TObject *obj, const char *option,
@@ -118 +123 @@
     // If it couldn't get found stop Eventloop
     //
-    *fLog << err << dbginf << fObjName << " not found... aborting." << endl;
-    return kFALSE;
+    *fLog << err << dbginf << fObjName << " not found... ";
+    if (TestBit(kSKIP))
+    {
+        *fLog << "removing task from list." << endl;
+        return kSKIP;
+    }
+    else
+    {
+        *fLog << "aborting." << endl;
+        return kFALSE;
+    }
 }
 

trunk/MagicSoft/Mars/mbase/MPrint.h

@@ -15 +15 @@
     TString fOption;         // Print option
 
+    enum { kSkip = BIT(14) };
+
     void Init(const char *name, const char *title);
 
@@ -22 +24 @@
 
     void SetOption(Option_t *option) { fOption = option; }
+    void EnableSkip(Bool_t skip=kTRUE) { skip ? SetBit(kSkip) : ResetBit(kSkip); }
 
     Bool_t PreProcess(MParList *pList);

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -380 +380 @@
     if (!noreset)
     {
-        fParList->SetReadyToSave();
+        fParList->SetReadyToSave(kFALSE);
         fParList->Reset();
         fParList->SetBit(MParList::kDoNotReset);

trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc

@@ -46 +46 @@
 #include "MReadMarsFile.h"
 #include "MGeomCamMagic.h"
+#include "MRawEvtHeader.h"
 
 #include "MMcEvt.hxx"
@@ -484 +485 @@
     txt += "PhEl";
 
+    const MRawEvtHeader *hed = (MRawEvtHeader*)GetParList()->FindObject("MRawEvtHeader");
+    if (hed)
+    {
+        txt += "  DAQEvt #";
+        txt += hed->GetDAQEvtNumber();
+    }
+
     fEvtInfo->SetText(txt);
 }

trunk/MagicSoft/Mars/mraw/MRawEvtHeader.cc

@@ -214 +214 @@
         }
     }
-
-    *fLog << endl;
     *fLog << endl;
 }

trunk/MagicSoft/Mars/mraw/MRawEvtHeader.h

@@ -54 +54 @@
 
     UShort_t GetTrigType() const { return fTrigType; }
+    UInt_t GetDAQEvtNumber() const { return fDAQEvtNumber; }
 
     int ReadEvt(istream& fin);