Changeset 3362 for trunk/MagicSoft/Mars

Timestamp:

02/29/04 17:22:31 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MHCalibrationChargeCam.cc (modified) (7 diffs)
• MHCalibrationChargeCam.h (modified) (1 diff)

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc

@@ -199 +199 @@
 }
 
+
+#if 0
 // --------------------------------------------------------------------------
 //
@@ -212 +214 @@
     // FIXME, this might be done faster and more elegant, by direct copy.
     //
-    MHCalibrationChargeCam *cam = new MHCalibrationChargeCam;
+    MHCalibrationChargeCam *cam = (MHCalibrationChargeCam*)(this)->Clone("");
 //    MHCalibrationChargeCam cam;
-    Copy(*cam);
+//    Copy(*cam);
 
 /*
+    cam->fHiGainArray->Delete();
+    cam->fLoGainArray->Delete();
+
     cam->fHiGainArray->Expand(nhi);
     cam->fLoGainArray->Expand(nlo);
@@ -230 +235 @@
         (*cam->fLoGainArray)[i] = (*fLoGainArray)[i]->Clone();
     }
-
+*/
+
+/*
     delete cam->fAverageHiGainInnerPix;
     delete cam->fAverageLoGainInnerPix;
@@ -250 +257 @@
     return cam;
 }
-
+#endif
 // --------------------------------------------------------------------------
 //
@@ -370 +377 @@
   Int_t   sumhioutersat = 0;
   Int_t   sumlooutersat = 0;
+
+  fNumInnerPixels = fNumOuterPixels = 0;
 
   for (int i=0; i<n; i++)
@@ -412 +421 @@
   fAverageLoGainOuterPix->FillHistAndArray(sumlooutertot/fNumOuterPixels); 
 
-  fAverageHiGainInnerPix->SetSaturated(sumhiinnersat/fNumInnerPixels); 
-  fAverageLoGainInnerPix->SetSaturated(sumloinnersat/fNumInnerPixels); 
-  fAverageHiGainOuterPix->SetSaturated(sumhioutersat/fNumOuterPixels); 
-  fAverageLoGainOuterPix->SetSaturated(sumlooutersat/fNumOuterPixels); 
+  fAverageHiGainInnerPix->SetSaturated((Float_t)sumhiinnersat/fNumInnerPixels); 
+  fAverageLoGainInnerPix->SetSaturated((Float_t)sumloinnersat/fNumInnerPixels); 
+  fAverageHiGainOuterPix->SetSaturated((Float_t)sumhioutersat/fNumOuterPixels); 
+  fAverageLoGainOuterPix->SetSaturated((Float_t)sumlooutersat/fNumOuterPixels); 
 
   //
@@ -428 +437 @@
       
       const Float_t timehi = (Float_t)pixel.GetIdxMaxHiGainSample();
-      const Float_t timelo = (Float_t)pixel.GetIdxMaxLoGainSample();
+      const Float_t timelo = (Float_t)pixel.GetIdxMaxLoGainSample() + 15.;
 
       (*this)[pixid].FillAbsTime(timehi);
-      (*this)(pixid).FillAbsTime(timelo+15.);
+      (*this)(pixid).FillAbsTime(timelo);
 
       if (fGeom->GetPixRatio(pixel.GetPixelId()) == 1.)

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.h

@@ -80 +80 @@
   Bool_t Finalize ( );
   
-  TObject *Clone(const char *) const;
-
   // Draw
   void Draw(const Option_t *opt);