Changeset 3651 for trunk/MagicSoft/Mars/manalysis

Timestamp:

04/05/04 16:48:56 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MGeomApply.cc (modified) (2 diffs)
• MHPedestalCam.cc (modified) (6 diffs)
• MHPedestalPix.h (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/MGeomApply.cc

@@ -74 +74 @@
 #include "MCalibrationRelTimeCam.h"
 #include "MCalibrationQECam.h"
+#include "MCalibrationPedCam.h"
 #include "MPedPhotCam.h"
 #include "MExtractedSignalCam.h"
@@ -156 +157 @@
       (MCalibrationQECam*)pList->FindObject(AddSerialNumber("MCalibrationQECam"));
     if (qe)
-        qe->InitSize(cam->GetNumPixels());
-
+      {
+        qe->InitSize           ( cam->GetNumPixels()  );
+        qe->InitAverageAreas   ( cam->GetNumAreas()   );
+        qe->InitAverageSectors ( cam->GetNumSectors() );
+      }
+    
+    MCalibrationPedCam *pcam = 
+      (MCalibrationPedCam*)pList->FindObject(AddSerialNumber("MCalibrationPedCam"));
+    if (pcam)
+      {
+        pcam->InitSize           ( cam->GetNumPixels()  );
+        pcam->InitAverageAreas   ( cam->GetNumAreas()   );
+        pcam->InitAverageSectors ( cam->GetNumSectors() );
+      }
+    
     MPedPhotCam *pedphot = (MPedPhotCam*)pList->FindObject(AddSerialNumber("MPedPhotCam"));
     if (pedphot)

trunk/MagicSoft/Mars/manalysis/MHPedestalCam.cc

@@ -90 +90 @@
 /////////////////////////////////////////////////////////////////////////////
 #include "MHPedestalCam.h"
+#include "MHPedestalPix.h"
 
 #include "MLog.h"
@@ -96 +97 @@
 #include "MParList.h"
 
-#include "MHPedestalPix.h"
-
 #include "MExtractedSignalCam.h"
 #include "MExtractedSignalPix.h"
@@ -106 +105 @@
 #include "MGeomCam.h"
 #include "MGeomPix.h"
+
+#include "MCalibrationPedCam.h"
 
 ClassImp(MHPedestalCam);
@@ -133 +134 @@
 // - MPedestalCam
 // - MExtractedSignalCam
+//
+// Searches or creates:
+// - MCalibrationPedCam
 //
 // Retrieves from MExtractedSignalCam:
@@ -179 +183 @@
     }
 
-  Float_t sliceshi = signal->GetNumUsedHiGainFADCSlices();
-  Float_t sliceslo = signal->GetNumUsedLoGainFADCSlices();
-
-  if (sliceshi == 0.)
-    {
-      gLog << err << "Number of used signal slices in MExtractedSignalCam is zero  ... abort." 
-           << endl;
-      return kFALSE;
-    }
-
-  if (fExtractHiGainSlices != 0. && sliceshi != fExtractHiGainSlices )
-    {
-      gLog << err << "Number of used High Gain signal slices changed in MExtractedSignalCam  ... abort." 
-           << endl;
-      return kFALSE;
-    }
-
-  if (fExtractLoGainSlices != 0. && sliceslo != fExtractLoGainSlices )
-    {
-      gLog << err << "Number of used Low Gain signal slices changed in MExtractedSignalCam  ... abort." 
-           << endl;
-      return kFALSE;
-    }
-
-  fExtractHiGainSlices = sliceshi;
-  fExtractLoGainSlices = sliceslo;
-
   const Int_t npixels  = fGeom->GetNumPixels();
   const Int_t nsectors = fGeom->GetNumSectors();
   const Int_t nareas   = fGeom->GetNumAreas();
+
+  fCam = (MCalibrationCam*)pList->FindObject("MCalibrationPedCam");
+  if (!fCam)
+    {
+      fCam = (MCalibrationCam*)pList->FindCreateObj(AddSerialNumber("MCalibrationPedCam"));
+      if (!fCam)
+        {
+          gLog << err << "Cannot find nor create MCalibrationPedCam ... abort." << endl;
+          return kFALSE;
+        }
+      else 
+        {
+          fCam->InitSize(npixels);
+          fCam->InitAverageAreas(nareas);
+          fCam->InitAverageSectors(nsectors);
+        }
+    }
+  
+  Float_t sliceshi = signal->GetNumUsedHiGainFADCSlices();
+  Float_t sliceslo = signal->GetNumUsedLoGainFADCSlices();
+
+  if (sliceshi == 0.)
+    {
+      gLog << err << "Number of used signal slices in MExtractedSignalCam is zero  ... abort." 
+           << endl;
+      return kFALSE;
+    }
+
+  if (fExtractHiGainSlices != 0. && sliceshi != fExtractHiGainSlices )
+    {
+      gLog << err << "Number of used High Gain signal slices changed in MExtractedSignalCam  ... abort." 
+           << endl;
+      return kFALSE;
+    }
+
+  if (fExtractLoGainSlices != 0. && sliceslo != fExtractLoGainSlices )
+    {
+      gLog << err << "Number of used Low Gain signal slices changed in MExtractedSignalCam  ... abort." 
+           << endl;
+      return kFALSE;
+    }
+
+  fExtractHiGainSlices = sliceshi;
+  fExtractLoGainSlices = sliceslo;
 
   if (fHiGainArray->GetEntries()==0)
@@ -431 +452 @@
 {
 
-  FitHiGainArrays((MCalibrationCam&)(*fCam),*fBadPixels, 
+  FitHiGainArrays((*fCam),*fBadPixels, 
                   MBadPixelsPix::kHiGainNotFitted,
                   MBadPixelsPix::kHiGainOscillating);
-  FitLoGainArrays((MCalibrationCam&)(*fCam),*fBadPixels,
+  FitLoGainArrays((*fCam),*fBadPixels,
                   MBadPixelsPix::kLoGainNotFitted,
                   MBadPixelsPix::kLoGainOscillating);

trunk/MagicSoft/Mars/manalysis/MHPedestalPix.h

@@ -11 +11 @@
 private:
 
-  static const Int_t   fgChargeNbins;        // Default for fNbins          (now set to: 450  )
-  static const Axis_t  fgChargeFirst;        // Default for fFirst          (now set to: -0.5  )
-  static const Axis_t  fgChargeLast;         // Default for fLast           (now set to: 449.5)
+  static const Int_t   fgChargeNbins;        // Default for fNbins   (now set to: 450  )
+  static const Axis_t  fgChargeFirst;        // Default for fFirst   (now set to: -0.5 )
+  static const Axis_t  fgChargeLast;         // Default for fLast    (now set to: 449.5)
 
   Float_t fNSlices;                         // Number of FADC slices summed in extraction