Changeset 6321 for trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc

Timestamp:

02/09/05 21:30:26 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc (modified) (8 diffs)

trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc

@@ -189 +189 @@
 //
 MExtractPedestal::MExtractPedestal(const char *name, const char *title)
-    : fRandomCalculation(kTRUE), fGeom(NULL), fPedestalsIn(NULL), fPedestalsOut(NULL), 
+    : fGeom(NULL), fPedestalsIn(NULL), fPedestalsInter(NULL), fPedestalsOut(NULL), 
       fExtractor(NULL), fExtractWinFirst(0), fExtractWinSize(0)
 {
@@ -199 +199 @@
     AddToBranchList("fHiGainFadcSamples");
     AddToBranchList("fLoGainFadcSamples");
-
-    SetPedestalUpdate(kTRUE);
+ 
+    SetIntermediateStorage( kFALSE );
+    SetPedestalUpdate     ( kTRUE  );
+    SetRandomCalculation  ( kTRUE  );
 
     SetNamePedestalCamIn();
@@ -239 +241 @@
 // - fRunHeader to NULL
 // - fEvtHeader to NULL
-// - fPedestalsIn to NULL
-// - fPedestalsOut to NULL
 //
 void MExtractPedestal::Clear(const Option_t *o)
@@ -347 +347 @@
           return kFALSE;
       }
+  }
+
+  if (!fPedestalsInter && fIntermediateStorage)
+  {
+      fPedestalsInter = (MPedestalCam*)pList->FindCreateObj("MPedestalCam", AddSerialNumber(fNamePedestalCamInter));
+      if (!fPedestalsInter)
+          return kFALSE;
   }
 
@@ -447 +454 @@
 Int_t MExtractPedestal::PostProcess()
 {
-    fPedestalsIn = NULL;
-    return kTRUE;
+  fPedestalsIn = NULL;
+  return kTRUE;
 }
 
@@ -493 +500 @@
     }
 
+    if (IsEnvDefined(env, prefix, "IntermediateStorage", print))
+    {
+        SetIntermediateStorage(GetEnvValue(env, prefix, "IntermediateStorage", fIntermediateStorage));
+        rc = kTRUE;
+    }
+
     // find resource for random calculation
     if (IsEnvDefined(env, prefix, "RandomCalculation", print))
@@ -523 +536 @@
     }
 
+    if (IsEnvDefined(env, prefix, "NamePedestalCamInter", print))
+    {
+        SetNamePedestalCamInter(GetEnvValue(env, prefix, "NamePedestalCamInter", fNamePedestalCamInter));
+        rc = kTRUE;
+    }
+
     if (IsEnvDefined(env, prefix, "NamePedestalCamOut", print))
     {
@@ -651 +670 @@
     *fLog << GetDescriptor() << ":" << endl;
     *fLog << "Name of input  MPedestalCam:  " << (fPedestalsIn?fPedestalsIn->GetName():fNamePedestalCamIn.Data()) << " (" << fPedestalsIn << ")" << endl;
+    *fLog << "Name of interm. MPedestalCam: " << (fPedestalsInter?fPedestalsInter->GetName():fNamePedestalCamInter.Data()) << " (" << fPedestalsInter << ")" << endl;
     *fLog << "Name of output MPedestalCam:  " << (fPedestalsOut?fPedestalsOut->GetName():fNamePedestalCamOut.Data()) << " (" << fPedestalsOut << ")" << endl;
+    *fLog << "Intermediate Storage is       " << (fIntermediateStorage?"on":"off") << endl;
     *fLog << "Pedestal Update is            " << (fPedestalUpdate?"on":"off") << endl;
     if (fPedestalUpdate)