Changeset 3084 for trunk/MagicSoft/Mars/mcalib

Timestamp:

02/10/04 22:45:23 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrationCalc.cc (modified) (6 diffs)
• MCalibrationCalc.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc

@@ -43 +43 @@
 //               Optionally exclude pixels from calibration               
 //
-//   Process:    Optionally, a cut on cosmics can be performed
-//               
-//               Every MCalibrationPix holds a histogram class,
+//   Process:    Every MCalibrationPix holds a histogram class,
 //               MHCalibrationPixel which itself hold histograms of type:
 //               HCharge(npix) (distribution of summed FADC time slice
@@ -144 +142 @@
   
     SETBIT(fFlags, kUseBlindPixelFit);
-    SETBIT(fFlags, kUseCosmicsRejection);
     SETBIT(fFlags, kUseQualityChecks);
     SETBIT(fFlags, kHiLoGainCalibration);
@@ -156 +153 @@
 
     fEvents            = 0;
-    fCosmics           = 0;
 
     fNumHiGainSamples  = 0;
@@ -391 +387 @@
   MRawEvtPixelIter pixel(fRawEvt);
   
-  //
-  // Perform cosmics cut
-  //
-  if (TESTBIT(fFlags,kUseCosmicsRejection))
-    {
-        
-      Int_t cosmicpix = 0;
-      
-      //
-      // Create a first loop to sort out the cosmics ...
-      // 
-      // This is a very primitive check for the number of cosmicpixs
-      // The cut will be applied in the fit, but for the blind pixel,
-      // we need to remove this event
-      //
-      // FIXME: In the future need a much more sophisticated one!!!
-      //
-      
-      while (pixel.Next())
-        {
-          
-          const UInt_t pixid = pixel.GetPixelId();
-          
-          MExtractedSignalPix &sig =  (*fSignals)[pixid];
-          MPedestalPix        &ped =  (*fPedestals)[pixid];
-          Float_t pedrms           = ped.GetPedestalRms()*fSqrtHiGainSamples;
-          Float_t sumhi            = sig.GetExtractedSignalHiGain();
-          
-          //
-          // We consider a pixel as presumably due to cosmics 
-          // if its sum of FADC slices is lower than 3 pedestal RMS
-          //
-          if (sumhi < 3.*pedrms )  
-            cosmicpix++;
-        }
-      
-      //
-      // If the camera contains more than 230 
-      // (this is the number of outer pixels plus about 50 inner ones)
-      // presumed pixels due to cosmics, then the event is discarted. 
-      // This procedure is more or less equivalent to keeping only events 
-      // with at least 350 pixels with high signals.
-      //
-      if (cosmicpix > 230.)
-        {
-          fCosmics++;
-          return kCONTINUE;
-        }
-      
-      pixel.Reset();
-    }
-  
   fEvents++;
 
-  //  Float_t referencetime = 0.;
-  
   //
   // Create a (second) loop to do fill the calibration histograms
@@ -624 +566 @@
     {
       *fLog << err << GetDescriptor() 
-            << ": This run contains only cosmics or pedestals, " 
-            << "cannot find events with more than 350 illuminated pixels. " << endl;
+            << ": This run contains no calibration data! " << endl;
       return kFALSE;
     }
   
-  if (fEvents < fCosmics)
-    *fLog << warn << GetDescriptor() 
-          << ": WARNING: Run contains more cosmics or pedestals than calibration events " << endl;
-
-
   *fLog << inf << GetDescriptor() << ": Cut Histogram Edges" << endl;
 
@@ -784 +720 @@
   fCalibrations->SetReadyToSave();
   
-  if (GetNumExecutions()==0)
-    return kTRUE;
-  
-  *fLog << inf << endl;
-  *fLog << dec << setfill(' ') << fCosmics << " Events presumably cosmics" << endl;
-
   return kTRUE;
 }
+
 
 Bool_t MCalibrationCalc::CalcSignalBlindPixel(Byte_t *ptr, Float_t &signal, const Float_t ped) const

trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.h

@@ -54 +54 @@
 
   Int_t fEvents;                           // Number of events  
-  Int_t fCosmics;                          // Number of events due to supposed cosmics
   
   Byte_t fNumHiGainSamples; 
@@ -67 +66 @@
 
   enum  { kUseBlindPixelFit, kUsePinDiodeFit,
-          kUseCosmicsRejection, kUseQualityChecks,
+          kUseQualityChecks,
           kHiLoGainCalibration,
           kHiGainOverFlow, kLoGainOverFlow  };
@@ -96 +95 @@
   void SkipPinDiodeFit(Bool_t b=kTRUE)
       {b ? CLRBIT(fFlags, kUsePinDiodeFit) : SETBIT(fFlags, kUsePinDiodeFit);}
-  void SkipCosmicsRejection(Bool_t b=kTRUE)
-      {b ? CLRBIT(fFlags, kUseCosmicsRejection) : SETBIT(fFlags, kUseCosmicsRejection);}
   void SkipQualityChecks(Bool_t b=kTRUE)
       {b ? CLRBIT(fFlags, kUseQualityChecks) : SETBIT(fFlags, kUseQualityChecks);}