Changeset 3270 for trunk/MagicSoft/Mars

Timestamp:

02/23/04 22:43:22 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MExtractBlindPixel.cc (modified) (2 diffs)
• mcalib/MExtractBlindPixel.h (modified) (3 diffs)
• mcalib/MExtractedSignalBlindPixel.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -12 +12 @@
 
    * mcalib/MExtractedSignalBlindPixel.h
+   * mcalib/MExtractBlindPixel.[h,cc]
      - included storage of pedestal
 

trunk/MagicSoft/Mars/mcalib/MExtractBlindPixel.cc

@@ -186 +186 @@
       *fLog << warn << "WARNING - saturation occurred in the Blind Pixel " << endl;
 
-    //
-    // catch the pointer to the event, because MHCalibrationChargeBlindPix will need it later
-    //
-    fPixelIter = &pixel;
-
     fBlindPixel->SetReadyToSave();
 
@@ -203 +198 @@
     if (&pedpix)
     {
-         fPed       = pedpix.GetPedestal()   * fNumSamples;
-         fPedErr    = pedpix.GetPedestalRms()* fNumSamples / TMath::Sqrt((Float_t)fPedestals->GetTotalEntries());
-         fPedRms    = pedpix.GetPedestalRms()* TMath::Sqrt((Float_t)fNumSamples);
-         fPedRmsErr = fPedErr/2.;
+         fBlindPixel->SetPed      ( pedpix.GetPedestal()   * fNumSamples );
+         fBlindPixel->SetPedErr   ( pedpix.GetPedestalRms()* fNumSamples / TMath::Sqrt((Float_t)fPedestals->GetTotalEntries()) );
+         fBlindPixel->SetPedRms   ( pedpix.GetPedestalRms()* TMath::Sqrt((Float_t)fNumSamples) );
+         fBlindPixel->SetPedRmsErr( fBlindPixel->GetPedErr()/2. );
     }
 

trunk/MagicSoft/Mars/mcalib/MExtractBlindPixel.h

@@ -33 +33 @@
   MRawEvtData         *fRawEvt;       // raw event data (time slices)
   MRawRunHeader       *fRunHeader;    // RunHeader information
-  MRawEvtPixelIter    *fPixelIter;    // pointer to the MRawEvt information
   MPedestalCam        *fPedestals;    // pointer to the pedestal information
   
@@ -43 +42 @@
 
   UInt_t  fBlindPixelIdx;
-
-  Float_t fPed;
-  Float_t fPedErr;
-  Float_t fPedRms;
-  Float_t fPedRmsErr;
-
   Int_t  PreProcess(MParList *pList);
   Int_t  Process();
@@ -58 +51 @@
   MExtractBlindPixel(const char *name=NULL, const char *title=NULL);
 
-  const MRawEvtPixelIter *GetPixelIter()    const { return fPixelIter; }
-
   // Setters
   void SetRange(const Byte_t first=fgFirst, const Byte_t last=fgLast);
   void SetSaturationLimit(const Byte_t lim=fgSaturationLimit) { fSaturationLimit = lim; }
   void SetBlindPixelIdx(  const UInt_t idx=fgBlindPixelIdx  ) { fBlindPixelIdx   = idx; }  
-
-  Float_t GetPed()       const { return fPed;       }
-  Float_t GetPedErr()    const { return fPedErr;    }
-  Float_t GetPedRms()    const { return fPedRms;    }
-  Float_t GetPedRmsErr() const { return fPedRmsErr; }
 
   ClassDef(MExtractBlindPixel, 0) // Task to fill the Extracted BlindPixel Containers from raw data

trunk/MagicSoft/Mars/mcalib/MExtractedSignalBlindPixel.cc

@@ -69 +69 @@
   fExtractedSignal    = gkSignalInitializer;
 
+  fPed                = gkSignalInitializer;;      
+  fPedErr             = gkSignalInitializer;;   
+  fPedRms             = gkSignalInitializer;;   
+  fPedRmsErr          = gkSignalInitializer;;  
+  
   fNumSaturated       = 0;
 }