Changeset 2658 for trunk/MagicSoft/Mars/manalysis

Timestamp:

12/11/03 17:42:25 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MCalibrationCalc.cc (modified) (10 diffs)
• MCalibrationPix.cc (modified) (1 diff)
• MExtractSignal.cc (modified) (4 diffs)
• MExtractedSignalPix.h (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/MCalibrationCalc.cc

@@ -252 +252 @@
 {
 
-    fEvents++;
-
     Int_t cosmicpix = 0;
 
@@ -273 +271 @@
     while (pixel.Next())
       {
-
-        const Int_t pixid = pixel.GetPixelId();
-
-        Int_t sum = pixel.GetSumHiGainSamples();
-
-        MPedestalPix    &ped = (*fPedestals)[pixid];
- 
-        Float_t pedes  = ped.GetPedestal();
+        
+        const UInt_t pixid = pixel.GetPixelId();
+        
+        MExtractedSignalPix &sig =  (*fSignals)[pixid];
+        MPedestalPix        &ped =  (*fPedestals)[pixid];
         Float_t pedrms = ped.GetPedestalRms();
+        Float_t sumhi  = sig.GetExtractedSignalHiGain();
         
-        if ((float)sum < ((pedes*fNumHiGainSamples)+(2.*fNumHiGainSamples*pedrms)) )
-           cosmicpix++;
+        if (sumhi < 15.*pedrms )   // cut at 3.5 sigma
+          cosmicpix++;
      }
 
-
-    if (cosmicpix > 50.)
+    if (cosmicpix > 100.)
       {
         fCosmics++;
@@ -295 +290 @@
 
     pixel.Reset();
+    fEvents++;
 
     //
@@ -304 +300 @@
 
         const UInt_t pixid = pixel.GetPixelId();
-
+        
         MExtractedSignalPix &sig =  (*fSignals)[pixid];
-
+        
         Float_t sumhi  = sig.GetExtractedSignalHiGain();
         Float_t sumlo  = sig.GetExtractedSignalLoGain();
         Bool_t  logain = sig.IsLoGainUsed();
 
-        Byte_t mid;
-
-        if (logain)
-            mid  = pixel.GetIdxMaxLoGainSample();
-        else
-            mid  = pixel.GetIdxMaxHiGainSample();
+        Float_t mtime  = sig.GetMeanArrivalTime();
 
         MCalibrationPix &pix = (*fCalibrations)[pixid];
@@ -329 +320 @@
                 "Overflow or Underflow occurred filling Blind Pixel sum = " << sumhi << endl;
 
-            if (!blindpixel.FillTime((int)mid)) 
+            if (!blindpixel.FillTime((int)mtime)) 
               *fLog << warn << 
-                "Overflow or Underflow occurred filling Blind Pixel time = " << (int)mid << endl;
+                "Overflow or Underflow occurred filling Blind Pixel time = " << mtime << endl;
             
             if (!blindpixel.FillRChargevsTime(sumhi,fEvents))
               *fLog << warn << 
                 "Overflow or Underflow occurred filling Blind Pixel eventnr = " << fEvents << endl;
+            break;
             
           case gkCalibrationPINDiodeId:
@@ -341 +333 @@
               *fLog << warn << 
                 "Overflow or Underflow occurred filling HCharge: means = " << sumhi << endl;
-            if (!pindiode.FillTime((int)mid)) 
+            if (!pindiode.FillTime((int)mtime)) 
               *fLog << warn << 
-                "Overflow or Underflow occurred filling HTime: time = " << (int)mid << endl;
+                "Overflow or Underflow occurred filling HTime: time = " << mtime << endl;
             if (!pindiode.FillRChargevsTime(sumhi,fEvents))
               *fLog << warn << 
                 "Overflow or Underflow occurred filling HChargevsN: eventnr = " << fEvents << endl;
+            break;
 
           default:
@@ -359 +352 @@
                         << " signal = " << sumlo << endl;
 
-                if (!pix.FillTimeLoGain((int)mid)) 
+                if (!pix.FillTimeLoGain((int)mtime)) 
                   *fLog << warn << "Could not fill Lo Gain Time of pixel: " 
-                        << pixid << " time = " << (int)mid << endl;
+                        << pixid << " time = " << mtime << endl;
                 
-                //
-                // Fill the reduced charge into the control histo for better visibility
-                //
                 if (!pix.FillRChargevsTimeLoGain(sumlo,fEvents))
                   *fLog << warn << "Could not fill Lo Gain Charge vs. EvtNr of pixel: " 
@@ -377 +367 @@
                         << " signal = " << sumhi << endl;
                 
-                if (!pix.FillTimeHiGain((int)mid)) 
+                if (!pix.FillTimeHiGain((int)mtime)) 
                   *fLog << warn << "Could not fill Hi Gain Time of pixel: " 
-                        << pixid << " time = " << (int)mid << endl;
+                        << pixid << " time = " << mtime << endl;
                 
                 if (!pix.FillRChargevsTimeHiGain(sumhi,fEvents))
@@ -385 +375 @@
                         << pixid << " signal = " << sumhi  << " event Nr: " << fEvents << endl;
               }
+            break;
             
           } /* switch(pixid) */
@@ -449 +440 @@
       pix.SetPedestal(ped,prms);
 
+      pix.FitCharge();
+
       if (TESTBIT(fFlags,kUseTimeFits))
         pix.FitTime();
       
-      pix.FitCharge();
     }
 

trunk/MagicSoft/Mars/manalysis/MCalibrationPix.cc

@@ -110 +110 @@
   if (fHist->UseLoGain())
     {
+
       SetHiGainSaturation();
 

trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc

@@ -163 +163 @@
 
         Byte_t *ptr   = pixel.GetHiGainSamples();
-        Byte_t *max   = ptr + pixel.GetIdxMaxHiGainSample();
-        Byte_t *end   = ptr + fRawEvt->GetNumHiGainSamples();
-        Byte_t *first;
-        Byte_t *last;
+        Byte_t *first = ptr + 3;
+        Byte_t *last  = ptr + 9;
 
         UInt_t  sumHi   = 0;
@@ -178 +176 @@
         const Float_t pedrms  = ped.GetPedestalRms();
 
-
-        if (max-3 < ptr)
-          {
-            first = ptr+3;
-            last  = ptr+3+fAfter+fBefore;
-          }
-        else if (max+fAfter-1 > end)
-          {
-            first = end-fAfter-fBefore-1;
-            last  = end-1;
-          }
-        else
-          {
-            first = max-fBefore;
-            last  = max+fAfter;
-          }
+        Byte_t maxhi  = 0;
+        Byte_t midhi  = 0;
 
         for (ptr=first;ptr<last;ptr++)
           {
+            
+            if (*ptr > maxhi)
+              {
+                maxhi = *ptr;
+                midhi = ptr-first;
+              }
+
             sumHi += *ptr;
+            
             if (*ptr >= fSaturationLimit)
               satHi++;
+
           }
 
         ptr   = pixel.GetLoGainSamples();
-        max   = ptr+pixel.GetIdxMaxLoGainSample();
-        end   = ptr+fRawEvt->GetNumLoGainSamples();
-
-        if (max-4 < ptr)
-          {
-            first = ptr+4;
-            last  = ptr+4+fAfter+fBefore;
-          }
-        else if (max+fAfter > end)
-          {
-            first = end-fAfter-fBefore;
-            last  = end;
-          }
-        else
-          {
-            first = max-fBefore;
-            last  = max+fAfter;
-          }
-
+        first = ptr + 3;
+        last  = ptr + 9;
+        Byte_t maxlo  = 0;
+        Byte_t midlo  = 0;
+        
         for (ptr=first;ptr<last;ptr++)
           {
+
+            if (*ptr > maxlo)
+              {
+                maxlo = *ptr;
+                midlo = ptr-first;
+              }
+
             sumLo += *ptr;
             if (*ptr >= fSaturationLimit)
@@ -233 +219 @@
               }
           }
-
-        //
-        // FIXME: This is preliminary, we will change to pedestals per slice!!!
-        // Assume pedestals per time slice ==> multiply with number of slices
-        //
-
         pix.SetExtractedSignal((float)sumHi - pedes*(float)fNumHiGainSamples,
                                pedrms*fSqrtHiGainSamples,
@@ -247 +227 @@
         pix.SetGainSaturation((satHi),satHi,satLo);
 
+        if (satHi)
+          pix.SetArrivalTimes((float)(midlo+3),0.);
+        else
+          pix.SetArrivalTimes((float)(midhi+3),0.);
+
       } /* while (pixel.Next()) */
 

trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.h

@@ -33 +33 @@
     Float_t GetExtractedSignalLoGainError() const   { return fExtractedSignalLoGainError; }
 
-    Float_t GetMeanArrivalTime()      const   { return fMeanArrivalTime; }
-    Float_t GetWidthArrivalTime()     const   { return fWidthArrivalTime; }
+    Float_t GetMeanArrivalTime()            const   { return fMeanArrivalTime; }
+    Float_t GetWidthArrivalTime()           const   { return fWidthArrivalTime; }
 
     void SetExtractedSignal(Float_t sig, Float_t sigerr)