Changeset 3355

Timestamp:

02/28/04 20:20:39 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

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

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc

@@ -140 +140 @@
     SetNumHiGainSaturationLimit();
     SetNumLoGainSaturationLimit();
+
+    fNumInnerPixels = 0;
+    fNumOuterPixels = 0; 
 }
 
@@ -367 +370 @@
   Int_t   sumhioutersat = 0;
   Int_t   sumlooutersat = 0;
-  Int_t   numinner = 0;
-  Int_t   numouter = 0;
 
   for (int i=0; i<n; i++)
@@ -393 +394 @@
           sumhiinnersat += sathi;
           sumloinnersat += satlo;
-          numinner++;
+          fNumInnerPixels++;
       }
       else
@@ -401 +402 @@
           sumhioutersat += sathi;
           sumlooutersat += satlo;
-          numouter++;
+          fNumOuterPixels++;
       }
 
     }
 
-  fAverageHiGainInnerPix->FillHistAndArray(sumhiinnertot/numinner); 
-  fAverageLoGainInnerPix->FillHistAndArray(sumloinnertot/numinner); 
-  fAverageHiGainOuterPix->FillHistAndArray(sumhioutertot/numouter); 
-  fAverageLoGainOuterPix->FillHistAndArray(sumlooutertot/numouter); 
-
-  fAverageHiGainInnerPix->SetSaturated(sumhiinnersat/numinner); 
-  fAverageLoGainInnerPix->SetSaturated(sumloinnersat/numinner); 
-  fAverageHiGainOuterPix->SetSaturated(sumhioutersat/numouter); 
-  fAverageLoGainOuterPix->SetSaturated(sumlooutersat/numouter); 
+  fAverageHiGainInnerPix->FillHistAndArray(sumhiinnertot/fNumInnerPixels); 
+  fAverageLoGainInnerPix->FillHistAndArray(sumloinnertot/fNumInnerPixels); 
+  fAverageHiGainOuterPix->FillHistAndArray(sumhioutertot/fNumOuterPixels); 
+  fAverageLoGainOuterPix->FillHistAndArray(sumlooutertot/fNumOuterPixels); 
+
+  fAverageHiGainInnerPix->SetSaturated(sumhiinnersat/fNumInnerPixels); 
+  fAverageLoGainInnerPix->SetSaturated(sumloinnersat/fNumInnerPixels); 
+  fAverageHiGainOuterPix->SetSaturated(sumhioutersat/fNumOuterPixels); 
+  fAverageLoGainOuterPix->SetSaturated(sumlooutersat/fNumOuterPixels); 
 
   //
@@ -420 +421 @@
   //
   sumhiinnertot = sumloinnertot = sumhioutertot = sumlooutertot = 0.;
-  numinner = numouter = 0;
+  fNumInnerPixels = fNumOuterPixels = 0;
   MRawEvtPixelIter pixel(fRawEvt);
   while (pixel.Next())
@@ -445 +446 @@
     }
 
-  fAverageHiGainInnerPix-> FillAbsTime(sumhiinnertot/numinner); 
-  fAverageLoGainInnerPix-> FillAbsTime(sumloinnertot/numinner); 
-  fAverageHiGainOuterPix-> FillAbsTime(sumhioutertot/numouter); 
-  fAverageLoGainOuterPix-> FillAbsTime(sumlooutertot/numouter); 
+  fAverageHiGainInnerPix-> FillAbsTime(sumhiinnertot/fNumInnerPixels); 
+  fAverageLoGainInnerPix-> FillAbsTime(sumloinnertot/fNumInnerPixels); 
+  fAverageHiGainOuterPix-> FillAbsTime(sumhioutertot/fNumOuterPixels); 
+  fAverageLoGainOuterPix-> FillAbsTime(sumlooutertot/fNumOuterPixels); 
 
   return kTRUE;
@@ -488 +489 @@
     FinalizeHiGainHists(*fAverageHiGainOuterPix,*fCam->GetAverageOuterPix());
     FinalizeLoGainHists(*fAverageLoGainOuterPix,*fCam->GetAverageOuterPix());
+
+    fCam->GetAverageInnerPix()->SetSigmaCharge   (fCam->GetAverageInnerPix()->GetSigmaCharge()   *TMath::Sqrt((Float_t)fNumInnerPixels));
+    fCam->GetAverageOuterPix()->SetSigmaCharge   (fCam->GetAverageOuterPix()->GetSigmaCharge()   *TMath::Sqrt((Float_t)fNumOuterPixels));
+    fCam->GetAverageInnerPix()->SetSigmaChargeErr(fCam->GetAverageInnerPix()->GetSigmaChargeErr()*TMath::Sqrt((Float_t)fNumInnerPixels));
+    fCam->GetAverageOuterPix()->SetSigmaChargeErr(fCam->GetAverageOuterPix()->GetSigmaChargeErr()*TMath::Sqrt((Float_t)fNumOuterPixels));
 
     return kTRUE;

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeHiGainPix.cc

@@ -88 +88 @@
   Int_t win = 1;
 
-  TVirtualPad *pad = gPad ? gPad : MH::MakeDefCanvas(this,600, 600);
+  TVirtualPad *oldpad = gPad ? gPad : MH::MakeDefCanvas(this,600, 600);
+  TVirtualPad *pad    = NULL;
+
+  oldpad->SetBorderMode(0);  
 
   pad->SetTicks();

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeHiGainPix.h

@@ -34 +34 @@
   void SetAbsTimeLast (const Axis_t last =fgAbsTimeLast)         { fAbsTimeLast  = last;    }
 
-  // Draw
-  void Draw(Option_t *opt="");
-
   ClassDef(MHCalibrationChargeHiGainPix, 1)  // Histogram class for a Calibration Pixel with extracted Hi Gain 
 };