Changeset 8498 for trunk/MagicSoft/Mars/msignal

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msignal

Files:

• MExtractBlindPixel.cc (modified) (2 diffs)
• MExtractPINDiode.cc (modified) (2 diffs)
• MExtractor.cc (modified) (8 diffs)
• MExtractor.h (modified) (4 diffs)

trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.cc

@@ -231 +231 @@
 
   fBlindPixel->SetExtractionType(fExtractionType);
-
+/*
   for (UInt_t i=0;i<fBlindPixelIdx.GetSize();i++)
   {
@@ -246 +246 @@
       }
   }
-/*
+
   const Int_t higainsamples = fRunHeader->GetNumSamplesHiGain();
   const Int_t logainsamples = fRunHeader->GetNumSamplesLoGain();

trunk/MagicSoft/Mars/msignal/MExtractPINDiode.cc

@@ -208 +208 @@
 
   fPedMean.Reset();
-
+/*
   const MPedestalPix &ped   = (*fPedestals)[fPINDiodeIdx]; 
 
@@ -222 +222 @@
         return kFALSE;
     }
-  
+  */
   if (fSlices)
     delete fSlices;

trunk/MagicSoft/Mars/msignal/MExtractor.cc

@@ -115 +115 @@
 
 const UInt_t  MExtractor::fgSaturationLimit = 245;
-const TString MExtractor::fgNamePedestalCam = "MPedestalCam";
 const TString MExtractor::fgNameSignalCam   = "MExtractedSignalCam";
 const Float_t MExtractor::fgOffsetLoGain    = 1.51;   // 5 ns
@@ -127 +126 @@
 // - all variables to 0
 // - fSaturationLimit to fgSaturationLimit
-// - fNamePedestalCam to fgNamePedestalCam
 // - fNameSignalCam to fgNameSignalCam
 // - fNoiseCalculation to kFALSE 
@@ -133 +131 @@
 MExtractor::MExtractor(const char *name, const char *title)
     : fResolutionPerPheHiGain(0), fResolutionPerPheLoGain(0),
-    fPedestals(NULL), fSignals(NULL), fRawEvt(NULL), fRunHeader(NULL),
-    fSignal(NULL),
+    fSignals(NULL), fRawEvt(NULL), fRunHeader(NULL), fSignal(NULL),
       /*fHiLoLast(0),*/ fNumHiGainSamples(0), fNumLoGainSamples(0)
 {
@@ -140 +137 @@
     fTitle = title ? title : "Base class for signal extractors";
 
-    SetNamePedestalCam();
     SetNameSignalCam();
     SetOffsetLoGain();
@@ -162 +158 @@
 //     MRawEvtData
 //     MRawRunHeader
-//     MPedestalCam
 //
 Int_t MExtractor::PreProcessStd(MParList *pList)
@@ -185 +180 @@
     {
         *fLog << err << AddSerialNumber("MPedestalSubtractedEvt") << " not found... aborting." << endl;
-        return kFALSE;
-    }
-
-
-    if (fPedestals)
-        return kTRUE;
-
-    fPedestals = (MPedestalCam*)pList->FindObject(AddSerialNumber(fNamePedestalCam), "MPedestalCam");
-    if (!fPedestals)
-    {
-        *fLog << err << AddSerialNumber(fNamePedestalCam) << " [MPedestalCam] not found... aborting" << endl;
         return kFALSE;
     }
@@ -207 +191 @@
 //  - MRawEvtData
 //  - MRawRunHeader
-//  - MPedestalCam
 //
 // The following output containers are also searched and created if
@@ -480 +463 @@
         *fLog << " Num Samples Hi/Lo:  " << Form("%2.1f %2.1f", fNumHiGainSamples, fNumLoGainSamples) << endl;
     }
-    if (fPedestals)
-        *fLog << " Pedestals:          " << fPedestals->GetName() << ", " << fPedestals << endl;
-}
+}

trunk/MagicSoft/Mars/msignal/MExtractor.h

@@ -17 +17 @@
 class MRawRunHeader;
 
-class MPedestalCam;
 class MPedestalSubtractedEvt;
 class MExtractedSignalCam;
@@ -33 +32 @@
 protected:
   static const UInt_t  fgSaturationLimit;  //! Default for fSaturationLimit (now set to: 254)
-  static const TString fgNamePedestalCam;  //! "MPedestalCam"
   static const TString fgNameSignalCam;    //! "MExtractedSignalCam"
   
   Float_t fOffsetLoGain;                   // Offset of the low-gain signal w.r.t. the High-Gain slices
 
-  MPedestalCam        *fPedestals;         //! Pedestals of all pixels in the camera
   MExtractedSignalCam *fSignals;           //! Extracted signal of all pixels in the camera
-                                       
+
   MRawEvtData         *fRawEvt;            //! Raw event data (time slices)
   MRawRunHeader       *fRunHeader;         //! RunHeader information
 
   MPedestalSubtractedEvt *fSignal;         //!
-                                       
+
   Byte_t   fHiGainFirst;                   // First FADC slice nr. to extract the High Gain signal
   Byte_t   fHiGainLast;                    // Last FADC slice nr. to extract the High Gain signal
@@ -61 +58 @@
   UInt_t   fSaturationLimit;               // Highest FADC slice value until being declared saturated
 
-  TString  fNamePedestalCam;               // Name of the 'MPedestalCam' container
   TString  fNameSignalCam;                 // Name of the 'MExtractedSignalCam' container
 
@@ -107 +103 @@
   void SetOffsetLoGain    ( const Float_t  f=fgOffsetLoGain          ) { fOffsetLoGain     = f;    }
   void SetSaturationLimit ( const UInt_t lim=fgSaturationLimit       ) { fSaturationLimit  = lim;  }
-  void SetNamePedestalCam ( const char *name=fgNamePedestalCam.Data()) { fNamePedestalCam  = name; }
   void SetNameSignalCam   ( const char *name=fgNameSignalCam.Data()  ) { fNameSignalCam    = name; }
   void SetNoiseCalculation( const Bool_t   b=kTRUE                   ) { fNoiseCalculation = b;    }
-
-  void SetPedestals (MPedestalCam *pedcam)   { fPedestals = pedcam; }
-  MPedestalCam *GetPedestals()   { return fPedestals; }
 
   // TObject