Changeset 3667 for trunk/MagicSoft/Mars/mcalib

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrationCam.cc (modified) (1 diff)
• MCalibrationCam.h (modified) (2 diffs)
• MHCalibrationCam.cc (modified) (1 diff)
• MHCalibrationChargeCam.cc (modified) (2 diffs)
• MHCalibrationRelTimeCam.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc

@@ -196 +196 @@
 }
 
+void MCalibrationCam::Init(const MGeomCam &geom)
+{
+    InitSize          (geom.GetNumPixels() );
+    InitAverageAreas  (geom.GetNumAreas()  );
+    InitAverageSectors(geom.GetNumSectors());
+}
+
 // --------------------------------------------------------------------------
 //

trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h

@@ -14 +14 @@
 class MBadPixelsPix;
 class MBadPixelsCam;
+class MGeomCam;
+
 class MCalibrationCam : public MParContainer, public MCamEvent
 {
@@ -31 +33 @@
   
   virtual void Clear(    Option_t *o="" );
+  void Init(const MGeomCam &geom);
   void InitSize( const UInt_t i );
   void InitAverageAreas(  const UInt_t i );

trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.cc

@@ -639 +639 @@
 {
   
-  for (Int_t j=0; j<fGeom->GetNumAreas(); j++)
+  for (UInt_t j=0; j<fGeom->GetNumAreas(); j++)
     {
   

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc

@@ -387 +387 @@
     }
   
-  const Int_t npixels  = fGeom->GetNumPixels();
-  const Int_t nareas   = fGeom->GetNumAreas();
-  const Int_t nsectors = fGeom->GetNumSectors();
-  const Int_t lofirst  = signal->GetFirstUsedSliceLoGain();
+  const UInt_t npixels  = fGeom->GetNumPixels();
+  const UInt_t nareas   = fGeom->GetNumAreas();
+  const UInt_t nsectors = fGeom->GetNumSectors();
+  const UInt_t lofirst  = signal->GetFirstUsedSliceLoGain();
 
   Float_t sumhiarea  [nareas],   sumloarea  [nareas],   timehiarea  [nareas],   timeloarea  [nareas];
@@ -410 +410 @@
   
 
-  for (Int_t i=0; i<npixels; i++)
+  for (UInt_t i=0; i<npixels; i++)
     {
 

trunk/MagicSoft/Mars/mcalib/MHCalibrationRelTimeCam.cc

@@ -297 +297 @@
     }
   
-  const Int_t npixels  = fGeom->GetNumPixels();
-  const Int_t nareas   = fGeom->GetNumAreas();
-  const Int_t nsectors = fGeom->GetNumSectors();
+  const UInt_t npixels  = fGeom->GetNumPixels();
+  const UInt_t nareas   = fGeom->GetNumAreas();
+  const UInt_t nsectors = fGeom->GetNumSectors();
 
   Float_t sumareahi  [nareas],   sumarealo  [nareas];