Changeset 8498 for trunk/MagicSoft/Mars/mpedestal

Timestamp:

05/11/07 16:47:18 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mpedestal

Files:

• MExtractPedestal.cc (modified) (7 diffs)
• MExtractPedestal.h (modified) (4 diffs)

trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.29 2007-05-11 10:25:45 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.30 2007-05-11 15:47:18 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -194 +194 @@
 //
 MExtractPedestal::MExtractPedestal(const char *name, const char *title)
-    : fGeom(NULL), fPedestalsIn(NULL), fPedestalsInter(NULL),
+    : fGeom(NULL), fPedestalsInter(NULL),
     fPedestalsOut(NULL), fExtractor(NULL), fSignal(0),
     fExtractWinFirst(0), fExtractWinSize(0), fUseSpecialPixels(kFALSE)
@@ -204 +204 @@
     SetRandomCalculation  ( kTRUE  );
 
-    SetNamePedestalCamIn();
     SetNamePedestalCamOut();
     SetNamePedestalCamInter();
@@ -427 +426 @@
   }
 
-  if (fExtractor && !fPedestalsIn)
-  {
-      fPedestalsIn = (MPedestalCam*)pList->FindObject(AddSerialNumber(fNamePedestalCamIn), "MPedestalCam");
-      if (!fPedestalsIn)
-      {
-          *fLog << err << AddSerialNumber(fNamePedestalCamIn) << " not found... aborting." << endl;
-          return kFALSE;
-      }
-  }
-
   if (!fPedestalsInter && fIntermediateStorage)
   {
@@ -603 +592 @@
 Int_t MExtractPedestal::PostProcess()
 {
-    fPedestalsIn = NULL;
     return fExtractor ? fExtractor->CallPostProcess() : kTRUE;
 }
@@ -947 +935 @@
 {
     *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;
@@ -1033 +1020 @@
     }
 
-    // find resource for MPedestalCam
-    if (IsEnvDefined(env, prefix, "NamePedestalCamIn", print))
-    {
-        SetNamePedestalCamIn(GetEnvValue(env, prefix, "NamePedestalCamIn", fNamePedestalCamIn));
-        rc = kTRUE;
-    }
-
     if (IsEnvDefined(env, prefix, "NamePedestalCamInter", print))
     {

trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.h

@@ -34 +34 @@
   static const UShort_t fgMaxSignalVar;     //! The maximum difference between the highest and lowest slice
 
-  TString fNamePedestalCamIn;        // Name of the incoming 'MPedestalCam' container
   TString fNamePedestalCamOut;       // Name of the outgoing 'MPedestalCam' container
   TString fNamePedestalCamInter;     // Name of the intermediate 'MPedestalCam' container
@@ -50 +49 @@
 
   MGeomCam      *fGeom;              //! Camera geometry
-  MPedestalCam  *fPedestalsIn;       //! Pedestals of all pixels in the camera (incoming)
   MPedestalCam  *fPedestalsInter;    //! Pedestals of all pixels in the camera (intermediate)
   MPedestalCam  *fPedestalsOut;      //! Pedestals of all pixels in the camera (outgoing)
@@ -130 +128 @@
 
   // names
-  void SetNamePedestalCamIn   (const char *name=fgNamePedestalCam) { fNamePedestalCamIn    = name; }
   void SetNamePedestalCamInter(const char *name=fgNamePedestalCam) { fNamePedestalCamInter = name; }
   void SetNamePedestalCamOut  (const char *name=fgNamePedestalCam) { fNamePedestalCamOut   = name; }
@@ -137 +134 @@
   // pointers
   void SetExtractor     ( MExtractTimeAndCharge *e) { fExtractor      = e; }
-  void SetPedestalsIn   ( MPedestalCam *pedcam    ) { fPedestalsIn    = pedcam; }
   void SetPedestalsInter( MPedestalCam *pedcam    ) { fPedestalsInter = pedcam; }
   void SetPedestalsOut  ( MPedestalCam *pedcam    ) { fPedestalsOut   = pedcam; }