Changeset 5570 for trunk/MagicSoft/Mars/mpedestal

Timestamp:

12/08/04 18:02:12 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mpedestal

Files:

• MExtractPedestal.cc (modified) (4 diffs)
• MExtractPedestal.h (modified) (1 diff)
• MPedCalcFromLoGain.cc (modified) (3 diffs)
• MPedCalcPedRun.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc

@@ -250 +250 @@
   fRunHeader    = NULL;
   fEvtHeader    = NULL;
-  fPedestalsOut = NULL;
 
   // If the size is yet set, set the size
@@ -344 +343 @@
   if (fExtractor && !fPedestalsIn)
   {
-      fPedestalsIn = (MPedestalCam*)pList->FindObject("MPedestalCam", AddSerialNumber(fNamePedestalCamIn));
+      fPedestalsIn = (MPedestalCam*)pList->FindObject(AddSerialNumber(fNamePedestalCamIn), "MPedestalCam");
       if (!fPedestalsIn)
       {
@@ -352 +351 @@
   }
 
-  fPedestalsOut = (MPedestalCam*)pList->FindCreateObj("MPedestalCam", AddSerialNumber(fNamePedestalCamOut));
   if (!fPedestalsOut)
-      return kFALSE;
+  {
+      fPedestalsOut = (MPedestalCam*)pList->FindCreateObj("MPedestalCam", AddSerialNumber(fNamePedestalCamOut));
+      if (!fPedestalsOut)
+          return kFALSE;
+  }
 
   *fLog << inf;
@@ -630 +632 @@
     *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 << "Num evts for pedestal   calc: " << fNumEventsDump << endl;
-    *fLog << "Num evts for avg.areas  calc: " << fNumAreasDump << endl;
-    *fLog << "Num evts for avg.sector calc: " << fNumSectorsDump << endl;
     *fLog << "Pedestal Update is            " << (fPedestalUpdate?"on":"off") << endl;
-    *fLog << "ExtractWindow from slice " << fExtractWinFirst << " to " << fExtractWinLast << " incl." << endl;
-
+    if (fPedestalUpdate)
+    {
+        *fLog << "Num evts for pedestal   calc: " << fNumEventsDump << endl;
+        *fLog << "Num evts for avg.areas  calc: " << fNumAreasDump << endl;
+        *fLog << "Num evts for avg.sector calc: " << fNumSectorsDump << endl;
+    }
     if (fExtractor)
         *fLog << "Extractor used:               " << fExtractor->ClassName() << endl;
-}
+    *fLog << "ExtractWindow from slice " << fExtractWinFirst << " to " << fExtractWinLast << " incl." << endl;
+}

trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.h

@@ -94 +94 @@
 
   void SetPedestalsIn(MPedestalCam *pedcam) { fPedestalsIn = pedcam; }
+  void SetPedestalsOut(MPedestalCam *pedcam) { fPedestalsOut = pedcam; }
 
   void SetExtractor(MExtractTimeAndCharge *e) { fExtractor = e; }

trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.cc

@@ -320 +320 @@
 
         Float_t sum  = 0.;
-        UInt_t  sumi = 0;
 
         //extract pedestal
@@ -327 +326 @@
         else
         {
+            UInt_t  sumi = 0;
             for(Byte_t *slice=slices+fExtractWinFirst; slice<=slices+fExtractWinLast; slice++)
                 sumi += *slice;
@@ -422 +422 @@
 
     Float_t dummy;
+    fExtractor->SetNoiseCalculation(kTRUE);
     fExtractor->FindTimeAndChargeHiGain(logain,logain,sum,dummy,dummy,dummy,sat,ped,logainabflag);
-}
-
+    fExtractor->SetNoiseCalculation(kFALSE);
+}
 
 // --------------------------------------------------------------------------

trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.cc

@@ -316 +316 @@
 
     Float_t dummy;
+    fExtractor->SetNoiseCalculation(kTRUE);
     fExtractor->FindTimeAndChargeHiGain(first,logain,sum,dummy,dummy,dummy,sat,ped,abflag);
+    fExtractor->SetNoiseCalculation(kFALSE);
 }