Changeset 3667 for trunk/MagicSoft/Mars/manalysis

Timestamp:

04/06/04 13:58:05 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MGeomApply.cc (modified) (2 diffs)
• MHPedestalCam.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/manalysis/MGeomApply.cc

@@ -75 +75 @@
 #include "MGeomCam.h"
 #include "MPedestalCam.h"
-#include "MCalibrationChargeCam.h"
-#include "MCalibrationRelTimeCam.h"
-#include "MCalibrationQECam.h"
-#include "MCalibrationPedCam.h"
+#include "MCalibrationCam.h"
 #include "MPedPhotCam.h"
 #include "MExtractedSignalCam.h"
@@ -140 +137 @@
         ped->InitSize(cam->GetNumPixels());
 
-    MCalibrationChargeCam *cal = 
-      (MCalibrationChargeCam*)pList->FindObject(AddSerialNumber("MCalibrationChargeCam"));
+    MCalibrationCam *cal = (MCalibrationCam*)pList->FindObject(AddSerialNumber("MCalibrationChargeCam"));
     if (cal)
-      {
-        cal->InitSize          ( cam->GetNumPixels()  );
-        cal->InitAverageAreas  ( cam->GetNumAreas()   );
-        cal->InitAverageSectors( cam->GetNumSectors() );
-      }
+        cal->Init(*cam);
 
-    MCalibrationRelTimeCam *cat = 
-      (MCalibrationRelTimeCam*)pList->FindObject(AddSerialNumber("MCalibrationRelTimeCam"));
+    MCalibrationCam *cat = (MCalibrationCam*)pList->FindObject(AddSerialNumber("MCalibrationRelTimeCam"));
     if (cat)
-      {
-        cat->InitSize          ( cam->GetNumPixels()  );
-        cat->InitAverageAreas  ( cam->GetNumAreas()   );
-        cat->InitAverageSectors( cam->GetNumSectors() );
-      }
-    
-    MCalibrationQECam *qe = 
-      (MCalibrationQECam*)pList->FindObject(AddSerialNumber("MCalibrationQECam"));
+        cat->Init(*cam);
+
+    MCalibrationCam *qe = (MCalibrationCam*)pList->FindObject(AddSerialNumber("MCalibrationQECam"));
     if (qe)
-      {
-        qe->InitSize           ( cam->GetNumPixels()  );
-        qe->InitAverageAreas   ( cam->GetNumAreas()   );
-        qe->InitAverageSectors ( cam->GetNumSectors() );
-      }
-    
-    MCalibrationPedCam *pcam = 
-      (MCalibrationPedCam*)pList->FindObject(AddSerialNumber("MCalibrationPedCam"));
+        qe->Init(*cam);
+
+    MCalibrationCam *pcam = (MCalibrationCam*)pList->FindObject(AddSerialNumber("MCalibrationPedCam"));
     if (pcam)
-      {
-        pcam->InitSize           ( cam->GetNumPixels()  );
-        pcam->InitAverageAreas   ( cam->GetNumAreas()   );
-        pcam->InitAverageSectors ( cam->GetNumSectors() );
-      }
-    
+        pcam->Init(*cam);
+
     MPedPhotCam *pedphot = (MPedPhotCam*)pList->FindObject(AddSerialNumber("MPedPhotCam"));
     if (pedphot)
         pedphot->InitSize(cam->GetNumPixels());
 
-
     MExtractedSignalCam *ext = (MExtractedSignalCam*)pList->FindObject(AddSerialNumber("MExtractedSignalCam"));
     if (ext)
         ext->InitSize(cam->GetNumPixels());
-
 
     MBlindPixels *bnd = (MBlindPixels*)pList->FindObject(AddSerialNumber("MBlindPixels"));

trunk/MagicSoft/Mars/manalysis/MHPedestalCam.cc

@@ -189 +189 @@
   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);
-        }
-    }
+
+      fCam->Init(*fGeom);
+  }
   
   Float_t sliceshi = signal->GetNumUsedHiGainFADCSlices();
@@ -369 +362 @@
     }
   
-  const Int_t npixels  = fGeom->GetNumPixels();
-  const Int_t nareas   = fGeom->GetNumAreas();
-  const Int_t nsectors = fGeom->GetNumSectors();
-
-  Float_t sumareahi  [nareas],   sumarealo  [nareas];
-  Float_t sumsectorhi[nsectors], sumsectorlo[nsectors];
-  Int_t   numareahi  [nareas],   numarealo  [nareas];
-  Int_t   numsectorhi[nsectors], numsectorlo[nsectors];
-
-  for (UInt_t j=0; j<nareas; j++)
-    {
-      sumareahi[j] = sumarealo[j] = 0.;
-      numareahi[j] = numarealo[j] = 0;
-    }
-  
-  for (UInt_t j=0; j<nsectors; j++)
-    {
-      sumsectorhi[j] = sumsectorlo[j] = 0.;
-      numsectorhi[j] = numsectorlo[j] = 0;
-    }
-  
-
-  for (Int_t i=0; i<npixels; i++)
-    {
-
+  const UInt_t npixels  = fGeom->GetNumPixels();
+  const UInt_t nareas   = fGeom->GetNumAreas();
+  const UInt_t nsectors = fGeom->GetNumSectors();
+
+  TArrayF sumareahi(nareas);
+  TArrayF sumarealo(nareas);
+  TArrayF sumsectorhi(nsectors);
+  TArrayD sumsectorlo(nsectors);
+  TArrayI numareahi(nareas);
+  TArrayI numarealo(nareas);
+  TArrayI numsectorhi(nsectors);
+  TArrayI numsectorlo(nsectors);
+
+  for (UInt_t i=0; i<npixels; i++)
+  {
       MHGausEvents &histhi = (*this)[i];
       MHGausEvents &histlo = (*this)(i);
 
       if (histhi.IsExcluded())
-        continue;
+          continue;
 
       const MExtractedSignalPix &pix = (*signal)[i];
-      
+
       const Float_t pedhi = pix.GetExtractedSignalHiGain();
       const Float_t pedlo = pix.GetExtractedSignalLoGain();