Changeset 2628

Timestamp:

12/09/03 18:48:55 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• macros/calibration.C (modified) (2 diffs)
• manalysis/MCalibrationCalc.cc (modified) (4 diffs)
• manalysis/MCalibrationCalc.h (modified) (2 diffs)

trunk/MagicSoft/Mars/macros/calibration.C

@@ -105 +105 @@
     read2.DisableAutoScheme();
 
+    MExtractSignal   sigsig;
     MCalibrationCalc calcalc;
 //    calcalc.SetSkipTFits();
+    MExtractedSignalCam   sigcam;
 
     plist2.AddToList(&geomcam);
+    plist2.AddToList(&sigcam);
 
     //
@@ -118 +121 @@
     tlist2.AddToList(&read2);
     tlist2.AddToList(&calcalc);
+    tlist2.AddToList(&sigsig);
 
     MHCamEvent hist2;

trunk/MagicSoft/Mars/manalysis/MCalibrationCalc.cc

@@ -93 +93 @@
 #include "MRawEvtPixelIter.h"
 
+#include "MExtractedSignalCam.h"
+#include "MExtractedSignalPix.h"
+
 #include "MTime.h"
 #include "TMath.h"
@@ -189 +192 @@
         return kFALSE;
       }
+
+
+    fSignals = (MExtractedSignalCam*)pList->FindObject("MExtractedSignalCam");
+    if (!fSignals)
+      {
+        *fLog << err << dbginf << "Cannot find MExtractedSignalCam ... aborting" << endl;
+        return kFALSE;
+      }
     
     return kTRUE;
@@ -290 +301 @@
       {
 
-        UShort_t sat = 0;
-
-        const Int_t pixid = pixel.GetPixelId();
-
-        Byte_t mid  = pixel.GetIdxMaxHiGainSample();
-        UInt_t max  = pixel.GetMaxHiGainSample();
-
-        MPedestalPix    &ped = (*fPedestals)[pixid]; 
+        const UInt_t pixid = pixel.GetPixelId();
+
+        MExtractedSignalPix &sig =  (*fSignals)[pixid];
+        Float_t sum = sig.GetExtractedSignal();
+        Bool_t  logain = sig.IsLoGainUsed();
+
+        Byte_t mid;
+
+        if (logain)
+            mid  = pixel.GetIdxMaxLoGainSample();
+        else
+            mid  = pixel.GetIdxMaxHiGainSample();
+
+
         MCalibrationPix &pix = (*fCalibrations)[pixid];
-
-        Float_t pedes  = ped.GetPedestal();
-        Float_t sum;
-
-        //
-        // FIXME: This is preliminary, we will change to pedestals per slice!!!
-        // Assume pedestals per time slice ==> multiply with number of slices
-        //
-
-        if (max < gkSaturationLimit)  // take Hi Gain
-          {
-            sum = (float)pixel.GetSumHiGainSamples() - pedes*fNumHiGainSamples;  
-          }
-        else                          // Lo Gain
-          {
-
-            sat++;
-            pix.SetHiGainSaturation();
-
-            sum = (float)pixel.GetSumLoGainSamples() - pedes*fNumLoGainSamples ;
-            sum *= gkConversionHiLo; 
-
-            max = pixel.GetMaxLoGainSample();
-            mid = pixel.GetIdxMaxLoGainSample();
-
-            if (max > gkSaturationLimit)
-              {
-                *fLog << err << dbginf 
-                      << "Warning: Saturation of Lo Gain reached in pixel: " 
-                      << pixid << " " << "   sum = " << sum << endl;
-                fHistOverFlow++;
-              }
-
-          }
 
         switch(pixid)
@@ -364 +347 @@
           default:
 
-            if (sat)
+            if (logain)
               {
                 

trunk/MagicSoft/Mars/manalysis/MCalibrationCalc.h

@@ -20 +20 @@
 class MPedestalCam;
 class MCalibrationCam;
+class MExtractedSignalCam;
 
 class MTime;
@@ -29 +30 @@
   MPedestalCam             *fPedestals;    // Pedestals of all pixels in the camera
   MCalibrationCam          *fCalibrations; // Calibration events of all pixels in the camera
+  MExtractedSignalCam      *fSignals;      // Calibration events of all pixels in the camera
 
   MRawEvtData              *fRawEvt;       // raw event data (time slices)