Changeset 5865 for trunk/MagicSoft

Timestamp:

01/16/05 22:06:14 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrateData.cc (modified) (6 diffs)
• mcalib/MCalibrateData.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -39 +39 @@
     - added possibility to update the conversion factors using the 
       MCalibrationChargeCam stored in fCalibUpdate. 
-
+    - added Print() function
 
   * mcalib/MCalibCalcFromPast.[h,cc]

trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc

@@ -284 +284 @@
     fCalibConsts.Reset();
     fCalibFFactors.Reset();
+    fHiLoConv.Reset();
+    fHiLoConvErr.Reset();
 
     return kTRUE;
@@ -436 +438 @@
 {
 
-  *fLog << inf << GetDescriptor() 
-        << ": Updating Conversion Factors... " << endl;
-
+    *fLog << inf << GetDescriptor() 
+          << ": Updating Conversion Factors... " << endl;
+    
+    fCalibConsts.Reset();
+    fCalibFFactors.Reset();
+    fHiLoConv.Reset();
+    fHiLoConvErr.Reset();
+    
     //
     // For the moment, we use only a dummy zenith for the calibration:
@@ -597 +604 @@
     }
 
+    //    Print();
+
     return kTRUE;
 }
@@ -624 +633 @@
             const MExtractedSignalPix &sig = (*fSignals)[pixidx];
 
-            Float_t signal = 0;
+            Float_t signal    = 0.;
             Float_t signalErr = 0.;
 
@@ -640 +649 @@
             const Float_t nphot    = signal                         * fCalibConsts  [pixidx];
             const Float_t nphotErr = TMath::Sqrt(TMath::Abs(nphot)) * fCalibFFactors[pixidx];
-
+            
             MCerPhotPix *cpix = fCerPhotEvt->AddPixel(pixidx, nphot, nphotErr);
 
@@ -785 +794 @@
     return rc;
 }
+
+void MCalibrateData::Print(Option_t *o) const 
+{
+  
+  *fLog << all << GetDescriptor() << ":" << endl;
+  
+  for (UInt_t pixidx=0; pixidx<fGeomCam->GetNumPixels(); pixidx++)
+    {
+      *fLog << all
+            << Form("%s%3i","Pixel: ",pixidx)
+            << Form("%s%4.2f","  CalibConst: ",fCalibConsts[pixidx])
+            << Form("%s%4.2f","  F-Factor: ",fCalibFFactors[pixidx])
+            << Form("%s%4.2f","  HiLoConv: ",fHiLoConv[pixidx])
+            << endl;
+    }
+}
+
+

trunk/MagicSoft/Mars/mcalib/MCalibrateData.h

@@ -106 +106 @@
 
   void   EnablePedestalType(PedestalType_t i)     { fPedestalFlag |=  i;      }
+
+  void   Print(Option_t *o="") const;
+
   void   SetPedestalFlag(PedestalType_t i=kRun)   { fPedestalFlag  =  i;      }
   Bool_t TestPedestalFlag(PedestalType_t i) const { return fPedestalFlag&i ? kTRUE : kFALSE; }