Changeset 2581 for trunk/MagicSoft/Mars/manalysis

Timestamp:

12/01/03 18:58:01 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• AnalysisLinkDef.h (modified) (1 diff)
• MCalibrationCalc.cc (modified) (11 diffs)
• MCalibrationCalc.h (modified) (1 diff)
• MCalibrationPix.cc (modified) (1 diff)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h

@@ -20 +20 @@
 #pragma link C++ class MPedestalPix+;
 #pragma link C++ class MPedestalCam+;
+#pragma link C++ class MPedCalcPedRun+;
 #pragma link C++ class MMcPedestalCopy+;
 #pragma link C++ class MMcPedestalNSBAdd+;

trunk/MagicSoft/Mars/manalysis/MCalibrationCalc.cc

@@ -136 +136 @@
 {
 
-    fOverFlow = 0;
-    fNrEvents = 0;
+    fHistOverFlow = 0;
+    fEvents       = 0;
+    fCosmics      = 0;
 
     fRawEvt = (MRawEvtData*)pList->FindObject("MRawEvtData");
@@ -235 +236 @@
 {
 
-    fNrEvents++;
+    fEvents++;
+
+    Bool_t cosmic = kFALSE;
 
     MCalibrationBlindPix &blindpixel = *(fCalibrations->GetBlindPixel());
@@ -267 +270 @@
             mid = pixel.GetIdxMaxLoGainSample();
 
-            sum = (max == gkSaturationLimit          // overflow of LoGain ??? -> GimmeABreak!!!
-                   ? fOverFlow++, gkLoGainOverFlow   // OUCH (Florian was maybe right)
-                   : sum*gkConversionHiLo    );      // OUFF (Florian was wrong) !! 
+            sum = (max == gkSaturationLimit              // overflow of LoGain ??? -> GimmeABreak!!!
+                   ? fHistOverFlow++, gkLoGainOverFlow   // OUCH (Florian was maybe right)
+                   : sum*gkConversionHiLo    );          // OUFF (Florian was wrong) !! 
 
             //            *fLog << warn << "Warning: Saturation of HiGain reached in slice " << (int)mid << " !!! " << endl;
             //            *fLog << warn << "Max = " << max << endl;
 
-            if (fOverFlow) 
+            if (fHistOverFlow) 
               *fLog << err << dbginf << "Warning: Saturation of LoGain reached! " 
                     << err << dbginf << "sum = " << sum << endl;
 
           }
-        
-        //
-        // sanity check (old MC files sometimes have pixids>577)
-        //
-        if (fPedestals && !fPedestals->CheckBounds(pixid))
-          {
-            *fLog << inf << "Pixel ID larger than camera... skipping event." << endl;
-            return kCONTINUE;
-              }
-        
+        
+
         MPedestalPix    &ped = (*fPedestals)[pixid];
         MCalibrationPix &pix = (*fCalibrations)[pixid];
         
-        Float_t pedes = ped.GetPedestal();
+        Float_t pedes  = ped.GetPedestal();
+        Float_t pedrms = ped.GetPedestalRms();
         
         //
@@ -298 +294 @@
         // Assume pedestals per time slice ==> multiply with number of slices
         //
-        pedes *= (sat ? fNumLoGainSamples : fNumHiGainSamples );
+        pedes  *= (sat ? fNumLoGainSamples : fNumHiGainSamples );
+        pedrms *= (sat ? fNumLoGainSamples : fNumHiGainSamples );
+
+        // 
+        // This is a very primitive check for the number of cosmics
+        // 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!!!
+        //
+
+        if ((float)sum < pedes+5.*pedrms)
+           cosmic = kTRUE;
 
         Float_t rsum      = (float)sum - pedes;
@@ -306 +314 @@
             
           case gkCalibrationBlindPixelId:
-            if (!blindpixel.FillQ(sum)) 
-              *fLog << warn << 
-                "Overflow or Underflow occurred filling Blind Pixel means = " << sum << endl;
+            // 
+            // FIXME: This works only when the blind pixel ID is much larger than 
+            //        the rest of the pixels (which is the case right now)
+            //
+//          if (!cosmic)
+               if (!blindpixel.FillQ(sum)) 
+                  *fLog << warn << 
+                  "Overflow or Underflow occurred filling Blind Pixel sum = " << sum << endl;
+
             if (!blindpixel.FillT((int)mid)) 
               *fLog << warn << 
                 "Overflow or Underflow occurred filling Blind Pixel time = " << (int)mid << endl;
-            if (!blindpixel.FillRQvsT(rsum,fNrEvents))
+
+            if (!blindpixel.FillRQvsT(rsum,fEvents))
               *fLog << warn << 
-                "Overflow or Underflow occurred filling Blind Pixel eventnr = " << fNrEvents << endl;
+                "Overflow or Underflow occurred filling Blind Pixel eventnr = " << fEvents << endl;
 
           case gkCalibrationPINDiodeId:
@@ -323 +338 @@
               *fLog << warn << 
                 "Overflow or Underflow occurred filling HT: time = " << (int)mid << endl;
-            if (!pindiode.FillRQvsT(rsum,fNrEvents))
+            if (!pindiode.FillRQvsT(rsum,fEvents))
               *fLog << warn << 
-                "Overflow or Underflow occurred filling HQvsN: eventnr = " << fNrEvents << endl;
+                "Overflow or Underflow occurred filling HQvsN: eventnr = " << fEvents << endl;
 
           default:
@@ -336 +351 @@
             // Fill the reduced charge into the control histo for better visibility
             //
-            if (!pix.FillRQvsT(rsum,fNrEvents))
+            if (!pix.FillRQvsT(rsum,fEvents))
               *fLog << warn << "Could not fill red. Q vs. EvtNr of pixel: " << pixid 
-                    << " signal = " << rsum  << " event Nr: " << fNrEvents << endl;
+                    << " signal = " << rsum  << " event Nr: " << fEvents << endl;
 
 
@@ -348 +363 @@
 
       } /* while (pixel.Next()) */
+
+    if (cosmic)
+        fCosmics++;
 
     fCalibrations->SetReadyToSave();
@@ -398 +416 @@
           MCalibrationPix &pix = (*fCalibrations)[pixid];
 
+          const Float_t ped    = (*fPedestals)[pixid].GetPedestal() * fNumHiGainSamples;
+          const Float_t prms   = (*fPedestals)[pixid].GetPedestalRms() * fNumHiGainSamples;
+
+          pix.SetPedestal(ped,prms);
 
           if (TESTBIT(fFlags,kUseTFits))
@@ -405 +427 @@
              continue;
 
-          const Float_t ped    = (*fPedestals)[pixid].GetPedestal();
-          const Float_t prms   = (*fPedestals)[pixid].GetPedestalRms();
-          pix.SetPedestal(ped,prms);
         }
     }
@@ -413 +432 @@
   fCalibrations->SetReadyToSave();
   
-  if (GetNumExecutions()==0 || fOverFlow==0)
+  if (GetNumExecutions()==0)
     return kTRUE;
   
-  *fLog << inf << endl;
-  *fLog << GetDescriptor() << " execution statistics:" << endl;
-  *fLog << dec << setfill(' ');
-  *fLog << " " << setw(7) << fOverFlow << " (" << setw(3) << (int)(fOverFlow*100/GetNumExecutions()) << "%) Evts skipped due to: lo gain saturated." << endl;
-  
+  *fLog << endl;
+  *fLog << dec << setfill(' ') << fCosmics << " Events presumably cosmics" << endl;
+
   return kTRUE;
 }

trunk/MagicSoft/Mars/manalysis/MCalibrationCalc.h

@@ -35 +35 @@
   MTime                    *fEvtTime;      // Time of the event
 
-  Int_t fNrEvents;                         // Number of events  
-  Int_t fOverFlow;                         // Number of events with saturated Low Gain
+  Int_t fEvents;                           // Number of events  
+  Int_t fHistOverFlow;                     // Number of events with saturated Low Gain
+  Int_t fCosmics;                          // Number of events due to supposed cosmics
 
   Byte_t fNumHiGainSamples; 

trunk/MagicSoft/Mars/manalysis/MCalibrationPix.cc

@@ -83 +83 @@
     return kTRUE;
 
+  if (fPed && fPedRms)
+    fHist->SetLowerFitRange(fPed + 3.5*fPedRms);
+  else
+    *fLog << warn << "Cannot set lower fit range to suppress cosmics: Pedestals not available" << endl;
+
   if(!fHist->FitQ())
     {

trunk/MagicSoft/Mars/manalysis/Makefile

@@ -33 +33 @@
 SRCFILES = MPedestalPix.cc \
            MPedestalCam.cc \
+           MPedCalcPedRun.cc \
            MMcPedestalCopy.cc \
            MMcPedestalNSBAdd.cc \