Changeset 4658 for trunk/MagicSoft/Mars/mcalib

Timestamp:

08/17/04 16:26:31 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrationChargeCalc.cc (modified) (1 diff)
• MCalibrationChargeCam.cc (modified) (1 diff)
• MCalibrationChargeCam.h (modified) (1 diff)
• MCalibrationTestCalc.cc (modified) (3 diffs)
• MCalibrationTestCam.h (modified) (1 diff)
• MHCalibrationChargeCam.cc (modified) (2 diffs)
• MHCalibrationTestCam.cc (modified) (4 diffs)
• MHCalibrationTestCam.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -1005 +1005 @@
       const Int_t   aidx  = (*fGeom)[i].GetAidx();
 
-      camphes.Fill(i,nphe);
-      camphes.SetUsed(i);
 
       areaphes    [aidx] += nphe;

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc

@@ -158 +158 @@
 }
 
-// -------------------------------------------------------------------
-//
-// Calls:
-// - MCalibrationCam::Init()
-//
-void MCalibrationChargeCam::Init(const MGeomCam &geom)
-{
-  MCalibrationCam::Init(geom);
-}
-
 // -----------------------------------------------
 //

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.h

@@ -46 +46 @@
   Bool_t  IsFFactorMethodValid            () const;
 
-  // Inits
-  void  Init                   ( const MGeomCam &geom         );
-  
   // Prints
   void   Print(Option_t *o="")         const;

trunk/MagicSoft/Mars/mcalib/MCalibrationTestCalc.cc

@@ -121 +121 @@
     }
   
-  fCam = (MCalibrationTestCam*)pList->FindCreateObj(AddSerialNumber("MCalibrationTestCam"));
+  fCam = (MCalibrationTestCam*)pList->FindCreateObj("MCalibrationTestCam");
   if (!fCam)
     {
@@ -411 +411 @@
           bad.SetUncalibrated( MBadPixelsPix::kDeviatingNumPhots );
           bad.SetUnsuitable  ( MBadPixelsPix::kUnsuitableRun     );
-          pix.SetExcluded();
           continue;
         }
@@ -561 +560 @@
 {
 
-  const TArrayI &arr = fTestCam->GetNotInterpolateablePixels();
-  const Int_t   size = arr.GetSize();
+  TArrayI arr(0);
+  
+  for (Int_t i=0; i<fCam->GetSize(); i++)
+    if ((*fCam)[i].IsExcluded())
+      {
+        const Int_t s = arr.GetSize();
+        arr.Set(s+1);
+        arr[s] = i;
+      }
+
+  const Int_t size = arr.GetSize();
   
   if (size == 0)

trunk/MagicSoft/Mars/mcalib/MCalibrationTestCam.h

@@ -64 +64 @@
   void  SetNumUninterpolated            ( const UInt_t i, const Int_t aidx );
   void  SetNumUninterpolatedInMaxCluster( const UInt_t i ) { fNumUninterpolatedInMaxCluster = i; }
+
+  // Draw
+  void DrawPixelContent( Int_t num) const {}
   
   ClassDef(MCalibrationTestCam, 1) // Container Test Calibration Results Camera

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc

@@ -243 +243 @@
 {
 
-  MExtractedSignalCam *signal = (MExtractedSignalCam*)pList->FindObject("MExtractedSignalCam");
+  MExtractedSignalCam *signal = (MExtractedSignalCam*)pList->FindObject(AddSerialNumber("MExtractedSignalCam"));
   if (!signal)
   {
@@ -250 +250 @@
   }
 
-  fCam = (MCalibrationCam*)pList->FindObject("MCalibrationChargeCam");
+  fCam = (MCalibrationCam*)pList->FindObject(AddSerialNumber("MCalibrationChargeCam"));
   if (!fCam)
     {

trunk/MagicSoft/Mars/mcalib/MHCalibrationTestCam.cc

@@ -90 +90 @@
 #include "MParList.h"
 
+#include "MCalibrationTestCam.h"
+
 #include "MCalibrationCam.h"
 #include "MCalibrationPix.h"
@@ -117 +119 @@
   SetAverageNbins(5000);
 
-  fNotInterpolateablePixels.Set(0);
 }
 
@@ -157 +158 @@
   }
 
+
   const Int_t npixels  = fGeom->GetNumPixels();
   const Int_t nsectors = fGeom->GetNumSectors();
@@ -378 +380 @@
       
       if (hist.IsEmpty())
-        {
-          const Int_t size = fNotInterpolateablePixels.GetSize();
-          fNotInterpolateablePixels.Set(size+1);
-          fNotInterpolateablePixels[size] = i;
-          continue;
-        }
+        continue;
 
       if (!hist.FitGaus())

trunk/MagicSoft/Mars/mcalib/MHCalibrationTestCam.h

@@ -12 +12 @@
 #endif
 
+
 class MGeomCam;
 class MHCalibrationTestCam : public MHCalibrationCam
@@ -23 +24 @@
   TArrayF fRmsSigmaPhotPerArea   ;
 
-  TArrayI fNotInterpolateablePixels;
-  
   Bool_t ReInitHists(MParList *pList);
   Bool_t FillHists(const MParContainer *par, const Stat_t w=1);
@@ -42 +41 @@
   const Float_t  GetRmsSigmaPhotPerArea  ( const Int_t aidx ) const { return fRmsSigmaPhotPerArea  [aidx]; }
 
-  const TArrayI &GetNotInterpolateablePixels ()               const { return fNotInterpolateablePixels;    }
-  
   void CalcAverageSigma();