Changeset 5817 for trunk/MagicSoft

Timestamp:

01/13/05 13:46:14 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• msignal/MExtractor.cc (modified) (1 diff)
• msignal/MExtractor.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -24 +24 @@
    * mcalib/MCalibColorSet.cc
      - fixed runs 45605-45609
+
+   * msignal/MExtractor.h
+     - take out the variable fHiLoLast from the streamer. Will be 
+       initialized in the ReInit(), if needed
+
+   * msignal/MExtractor.cc
+     - Initialized fHiLoLast to 0. Otherwise, a second eventloop with 
+       the same extractor may have that variable set to a certain 
+       value, even if not desired. The ReInit() fixes fHiLoLast, if 
+       different from 0.
 
 

trunk/MagicSoft/Mars/msignal/MExtractor.cc

@@ -140 +140 @@
 }
 
+//-----------------------------------------------------------------------
+//
+// - Set the variable fHiLoLast to 0 (will be initialized later in ReInit()
+// - Get the pointers to: 
+//     MRawEvtData
+//     MRawRunHeader
+//     MPedestalCam
+//
 Int_t MExtractor::PreProcessStd(MParList *pList)
 {
+
+    fHiLoLast = 0;
+
     fRawEvt = (MRawEvtData*)pList->FindObject(AddSerialNumber("MRawEvtData"));
     if (!fRawEvt)

trunk/MagicSoft/Mars/msignal/MExtractor.h

@@ -47 +47 @@
   Byte_t   fLoGainLast;                    // Last FADC slice nr. to extract the Low Gain signal
                                            
-  Byte_t   fHiLoLast;                      // Number of slices in fLoGainSamples counted for the High-Gain signal
+  Byte_t   fHiLoLast;                      //! Number of slices in fLoGainSamples counted for the High-Gain signal
                                            
   Float_t  fNumHiGainSamples;              // Number High Gain FADC slices used to extract the signal