Changeset 5715 for trunk/MagicSoft

Timestamp:

01/07/05 12:58:11 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mbase/MLog.h (modified) (2 diffs)
• mbase/MPrint.cc (modified) (3 diffs)
• mbase/MPrint.h (modified) (1 diff)
• mfileio/MReadTree.cc (modified) (2 diffs)
• mpedestal/MExtractPedestal.cc (modified) (6 diffs)
• mpedestal/MExtractPedestal.h (modified) (5 diffs)
• mpedestal/MPedCalcFromLoGain.cc (modified) (3 diffs)
• mpedestal/MPedCalcFromLoGain.h (modified) (3 diffs)
• mpedestal/MPedCalcPedRun.cc (modified) (3 diffs)
• mpedestal/MPedCalcPedRun.h (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MLog.h

@@ -190 +190 @@
     void WriteEnv(TEnv &env, TString prefix="", Bool_t print=kFALSE) const;
 
-    void Separator(TString str="", int outlvl=0)
+    MLog &Separator(TString str="", int outlvl=0)
     {
         if (!str.IsNull())
@@ -207 +207 @@
         (*this) << str << std::endl;
         fOutputLevel = save;
+
+        return *this;
     }
 

trunk/MagicSoft/Mars/mbase/MPrint.cc

@@ -65 +65 @@
 {
     Init(0, 0);
-    SetBit(kSeperator);
+    SetBit(kSeparator);
 }
 
@@ -118 +118 @@
     // The pointer is already given by the user.
     //
-    if (fObject || TestBit(kSeperator))
+    if (fObject || TestBit(kSeparator))
         return kTRUE;
 
@@ -149 +149 @@
 Int_t MPrint::Process()
 {
-    if (TestBit(kSeperator))
-        gLog << endl << setfill('-') << setw(72) << "-" << endl << endl;
+    if (TestBit(kSeparator))
+        gLog.Separator() << endl;
     else
         fObject->Print(fOption);

trunk/MagicSoft/Mars/mbase/MPrint.h

@@ -15 +15 @@
     TString fOption;         // Print option
 
-    enum { kSkip = BIT(14), kSeperator = BIT(15) };
+    enum { kSkip = BIT(14), kSeparator = BIT(15) };
 
     void Init(const char *name, const char *title);

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -287 +287 @@
 //  via AddNotify.
 //
+//  For unknown reasons root stores the SetAutoDelete-Flag in
+//  a branch having a custom streamer (eg. MRawEvtData).
+//  It is not allowed that a container which is in the parameter
+//  list gets a new address. Therefor we reset all the autodel flags.
+//
+//  MAKE SURE THAT ALL YOPUR CUSTOM STREAMERS TAKE CARE OF ALL MEMORY
+//
 Bool_t MReadTree::Notify()
 {
@@ -299 +306 @@
     *fLog << GetNumEntry()-1 << ")" << endl;
 
+    //
+    // For unknown reasons root stores the SetAutoDelete-Flag in
+    // a branch having a custom streamer (eg. MRawEvtData).
+    // It is not allowed that a container which is in the parameter
+    // list gets a new address. Therefor we reset all the autodel flags.
+    //
+    // MAKE SURE THAT ALL YOPUR CUSTOM STREAMERS TAKE CARE OF ALL MEMORY
+    //
+    TIter NextB(fTree->GetListOfBranches());
+    TBranch *b=0;
+    while ((b=(TBranch*)NextB()))
+        if (b->IsAutoDelete())
+        {
+            *fLog << warn << "Branch " << b->GetName() << "->IsAutoDelete() set... resetting." << endl;
+            b->SetAutoDelete(kFALSE);
+        }
+
     if (!fNotify)
         return kTRUE;
 
-    TIter Next(fNotify);
+    TIter NextN(fNotify);
     TObject *o=NULL;
-    while ((o=Next()))
+    while ((o=NextN()))
         if (!o->Notify())
         {

trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc

@@ -189 +189 @@
 //
 MExtractPedestal::MExtractPedestal(const char *name, const char *title)
-    : fGeom(NULL), fPedestalsIn(NULL), fPedestalsOut(NULL), fExtractor(NULL),
-      fExtractWinFirst(0), fExtractWinSize(0)
+    : fRandomCalculation(kTRUE), fGeom(NULL), fPedestalsIn(NULL), fPedestalsOut(NULL), 
+      fExtractor(NULL), fExtractWinFirst(0), fExtractWinSize(0)
 {
     fName  = name  ? name  : "MExtractPedestal";
@@ -204 +204 @@
     SetNamePedestalCamIn();
     SetNamePedestalCamOut();
-    SetNumEventsDump();
-    SetNumAreasDump();
-    SetNumSectorsDump();
+    SetNumDump();
 
     Clear();
@@ -361 +359 @@
   Print();
 
+  // FIMXE: MUST call fExtractor->PreProcess()???
   return kTRUE;
+}
+
+Int_t MExtractPedestal::Process()
+{
+    if (fExtractor)
+        fExtractor->SetNoiseCalculation(fRandomCalculation);
+
+    const Int_t rc = Calc();
+
+    if (fExtractor)
+        fExtractor->SetNoiseCalculation(kFALSE);
+
+    return rc;
 }
 
@@ -447 +459 @@
 //    NumEventsDump:        500
 //    PedestalUpdate:       yes
+//    RandomCalculation:    yes
 //
 Int_t MExtractPedestal::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
@@ -477 +490 @@
     {
         SetPedestalUpdate(GetEnvValue(env, prefix, "PedestalUpdate", fPedestalUpdate));
+        rc = kTRUE;
+    }
+
+    // find resource for random calculation
+    if (IsEnvDefined(env, prefix, "RandomCalculation", print))
+    {
+        SetRandomCalculation(GetEnvValue(env, prefix, "RandomCalculation", fRandomCalculation));
         rc = kTRUE;
     }
@@ -640 +660 @@
     }
     if (fExtractor)
-        *fLog << "Extractor used:               " << fExtractor->ClassName() << endl;
+    {
+        *fLog << "Extractor used:               " << fExtractor->ClassName() << " (";
+        *fLog << (fRandomCalculation?"":"non-") << "random)" << endl;
+    }
     *fLog << "ExtractWindow from slice " << fExtractWinFirst << " to " << fExtractWinLast << " incl." << endl;
 }

trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.h

@@ -26 +26 @@
   static const TString  fgNamePedestalCam;  //! "MPedestalCam"
 
+  TString fNamePedestalCamIn;   // name of the incoming 'MPedestalCam' container
+  TString fNamePedestalCamOut;  // name of the outgoing 'MPedestalCam' container  
+
+  Bool_t  fRandomCalculation;  // Is pedestalextraction by extractor random?
+
 protected:
   
@@ -39 +44 @@
   UShort_t fExtractWinSize;     // Number of slices to calculate the pedestal from
   UShort_t fExtractWinLast;     // Last FADC slice to extract pedestal from 
-
-  TString fNamePedestalCamIn;   // name of the incoming 'MPedestalCam' container
-  TString fNamePedestalCamOut;  // name of the outgoing 'MPedestalCam' container  
 
   UInt_t  fNumEventsDump;       // Number of event after which MPedestalCam gets updated
@@ -66 +68 @@
   MArrayI fSectorValid;        // number of valid pixels within sector idx
 
+  // MTask virtual functions
   Int_t  PreProcess(MParList *pList);
+  Int_t  Process();
   Int_t  PostProcess();
   Bool_t ReInit(MParList *pList);
   Int_t  ReadEnv(const TEnv &env, TString prefix, Bool_t print);
 
-  virtual void ResetArrays();
+  // Interface to be overwritten by a new class
+  virtual void  ResetArrays();
+  virtual Int_t Calc() = 0;
 
+  // Helper functions
   void CalcPixResults   (const UInt_t nevts, const UInt_t pixid);
   void CalcAreaResults  (const UInt_t nevts, const UInt_t napix, const UInt_t aidx);
@@ -85 +92 @@
   Bool_t SetExtractWindow(UShort_t first, UShort_t size);
 
-  void SetNumEventsDump  (UInt_t dumpevents=500)  { fNumEventsDump  = dumpevents; }
-  void SetNumAreasDump   (UInt_t dumpevents=500)  { fNumAreasDump   = dumpevents; }
-  void SetNumSectorsDump (UInt_t dumpevents=500)  { fNumSectorsDump = dumpevents; }
+  void SetNumEventsDump(UInt_t dumpevents=500)  { fNumEventsDump  = dumpevents; }
+  void SetNumAreasDump(UInt_t dumpevents=500)  { fNumAreasDump   = dumpevents; }
+  void SetNumSectorsDump(UInt_t dumpevents=500)  { fNumSectorsDump = dumpevents; }
+  void SetNumDump(UInt_t n=500) { fNumEventsDump=n; fNumAreasDump=n; fNumSectorsDump=n; }
   void SetPedestalUpdate (Bool_t pedupdate=kTRUE) { fPedestalUpdate = pedupdate;  }
 
@@ -97 +105 @@
 
   void SetExtractor(MExtractTimeAndCharge *e) { fExtractor = e; }
+  void SetRandomCalculation(Bool_t b=kTRUE) { fRandomCalculation = b; }
 
   ClassDef(MExtractPedestal, 0)   // Base class for pedestal extractors

trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.cc

@@ -280 +280 @@
 // calculate the overall mean and rms in the PostProcess()
 //
-Int_t MPedCalcFromLoGain::Process()
+Int_t MPedCalcFromLoGain::Calc()
 {
     // This is the workaround to put hi- and lo-gains together
@@ -422 +422 @@
 
     Float_t dummy;
-    fExtractor->SetNoiseCalculation(kTRUE);
     fExtractor->FindTimeAndChargeHiGain(logain,logain,sum,dummy,dummy,dummy,sat,ped,logainabflag);
-    fExtractor->SetNoiseCalculation(kFALSE);
 }
 
@@ -500 +498 @@
     MExtractPedestal::Print(o);
 
-    *fLog << "CheckWindow   from slice  " << fCheckWinFirst   << " to " << fCheckWinLast << " incl." << endl;
-    *fLog << "Max. allowed signal variation:             " << fMaxSignalVar << endl;
-    *fLog << endl;
-}
+    *fLog << "Max.allowed signal variation: " << fMaxSignalVar << endl;
+    *fLog << "CheckWindow from slice " << fCheckWinFirst   << " to " << fCheckWinLast << " incl." << endl;
+}

trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.h

@@ -35 +35 @@
     MArrayB fSlices;             //! workaround to put hi- and lo-gain slices together
 
+    Bool_t fRandomCalculation;
+
     Bool_t ReInit(MParList *pList);
-    Int_t  Process();
+    Int_t  Calc();
     Int_t  PostProcess();
 
@@ -49 +51 @@
 
 public:
-
     MPedCalcFromLoGain(const char *name=NULL, const char *title=NULL);
 
@@ -56 +57 @@
     // Setters
     Bool_t SetCheckRange(UShort_t checkfirst=fgCheckWinFirst, UShort_t checklast=fgCheckWinLast);
-    void SetMaxSignalVar(UShort_t maxvar=40)       { fMaxSignalVar = maxvar;    }
+    void SetMaxSignalVar(UShort_t maxvar=40)  { fMaxSignalVar = maxvar;    }
 
     // Getters

trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.cc

@@ -251 +251 @@
 // calculate the overall mean and rms in the PostProcess()
 //
-Int_t MPedCalcPedRun::Process()
+Int_t MPedCalcPedRun::Calc()
 {
     if (!IsPedBitSet())
@@ -316 +316 @@
 
     Float_t dummy;
-    fExtractor->SetNoiseCalculation(kTRUE);
     fExtractor->FindTimeAndChargeHiGain(first,logain,sum,dummy,dummy,dummy,sat,ped,abflag);
-    fExtractor->SetNoiseCalculation(kFALSE);
 }
 
@@ -433 +431 @@
 void MPedCalcPedRun::Print(Option_t *o) const
 {
-    *fLog << GetDescriptor() << ":" << endl;
-    *fLog << "Name of input  MPedestalCam:   " << (fPedestalsIn?fPedestalsIn->GetName():fNamePedestalCamIn.Data()) << " (" << fPedestalsIn << ")" << endl;
-    *fLog << "Name of output MPedestalCam:   " << (fPedestalsOut?fPedestalsOut->GetName():fNamePedestalCamOut.Data()) << " (" << fPedestalsOut << ")" << endl;
-    *fLog << "ExtractWindow from slice       " << fExtractWinFirst << " to " << fExtractWinLast << " incl." << endl;
-    *fLog << "Number overlap lo-gain slices: " << fOverlap << endl;
-    *fLog << "First ped run out of sequence: " << (fIsFirstPedRun?"yes":"no") << endl;
-    *fLog << "Number of used events so far:  " << fUsedEvents << endl;
-
-    if (fExtractor)
-        *fLog << "Extractor used:                " << fExtractor->ClassName() << endl;
-
-    *fLog << endl;
-}
+    MExtractPedestal::Print(o);
+
+    *fLog << "ExtractWindow from slice      " << fExtractWinFirst << " to " << fExtractWinLast << " incl." << endl;
+    *fLog << "Num overlap lo-gain slices:   " << fOverlap << endl;
+    *fLog << "First pedrun out of sequence: " << (fIsFirstPedRun?"yes":"no") << endl;
+    *fLog << "Number of used events so far: " << fUsedEvents << endl;
+}

trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.h

@@ -25 +25 @@
     Bool_t ReInit(MParList *pList);
     Int_t  PreProcess(MParList *pList);
-    Int_t  Process();
+    Int_t  Calc();
     Int_t  PostProcess();