Changeset 7430 for trunk/MagicSoft/Mars/mhcalib

Timestamp:

11/25/05 14:47:57 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhcalib

Files:

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

trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc

@@ -102 +102 @@
 #include "MHCalibrationCam.h"
 
-#include "MLog.h"
-#include "MLogManip.h"
-
-#include "MParList.h"
-
-#include "MHCalibrationPix.h"
-
-#include "MCalibrationIntensityCam.h"
-#include "MCalibrationChargeCam.h"
-#include "MCalibrationChargePix.h"
-
-#include "MGeomCam.h"
-#include "MGeomPix.h"
-
-#include "MBadPixelsIntensityCam.h"
-#include "MBadPixelsCam.h"
-#include "MBadPixelsPix.h"
-
-#include "MRawEvtData.h"
-#include "MRawRunHeader.h"
-#include "MRawEvtPixelIter.h"
-
-#include "MExtractedSignalCam.h"
-#include "MExtractedSignalPix.h"
-
-#include "MArrayI.h"
-#include "MArrayD.h"
-
 #include <TOrdCollection.h>
 #include <TPad.h>
@@ -140 +112 @@
 #include <TGraph.h>
 #include <TEnv.h>
+
+#include "MLog.h"
+#include "MLogManip.h"
+
+#include "MParList.h"
+
+#include "MHCalibrationPix.h"
+
+#include "MCalibrationIntensityCam.h"
+#include "MCalibrationChargeCam.h"
+#include "MCalibrationChargePix.h"
+
+#include "MGeomCam.h"
+#include "MGeomPix.h"
+
+#include "MBadPixelsIntensityCam.h"
+#include "MBadPixelsCam.h"
+#include "MBadPixelsPix.h"
+
+#include "MRawEvtData.h"
+#include "MRawRunHeader.h"
+#include "MRawEvtPixelIter.h"
+
+#include "MExtractedSignalCam.h"
+#include "MExtractedSignalPix.h"
+
+#include "MArrayI.h"
+#include "MArrayD.h"
 
 ClassImp(MHCalibrationPulseTimeCam);
@@ -512 +512 @@
   *fLog << endl;
 
-  MCalibrationCam *calcam  = fIntensCam ? fIntensCam->GetCam() : fCam;
+  MCalibrationCam &calcam  = *(fIntensCam ? fIntensCam->GetCam() : fCam);
   //
   // Perform the fitting for the High Gain (done in MHCalibrationCam)
@@ -524 +524 @@
         continue;
       
-      MCalibrationPix &pix    = (*calcam)[i];
+      MCalibrationPix &pix    = calcam[i];
       CalcHists(hist,pix);
     }
@@ -534 +534 @@
     {
       
-      MHCalibrationPix &hist = GetAverageHiGainArea(j);      
-      MCalibrationPix  &pix  = calcam->GetAverageArea(j);
+      MHCalibrationPix &hist = GetAverageHiGainArea(j);
+      MCalibrationPix  &pix  = calcam.GetAverageArea(j);
       CalcHists(hist,pix);
   }
@@ -541 +541 @@
   for (Int_t j=0; j<fAverageHiGainSectors->GetSize(); j++)
     {
-      MHCalibrationPix &hist = GetAverageHiGainSector(j);      
-      MCalibrationPix  &pix  = calcam->GetAverageSector(j);
+      MHCalibrationPix &hist = GetAverageHiGainSector(j);
+      MCalibrationPix  &pix  = calcam.GetAverageSector(j);
       CalcHists(hist,pix);
     }
@@ -549 +549 @@
 }
 
-void MHCalibrationPulseTimeCam::CalcHists(MHCalibrationPix &hist, MCalibrationPix &pix)
+void MHCalibrationPulseTimeCam::CalcHists(MHCalibrationPix &hist, MCalibrationPix &pix) const
 {
 

trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.h

@@ -61 +61 @@
   void   DrawDataCheckPixel(MHCalibrationPix &pix, const Float_t refline);
   void   DisplayRefLines   ( const TH1F *hist,           const Float_t refline) const;
-  void   CalcHists         (MHCalibrationPix &hist, MCalibrationPix &pix);
+  void   CalcHists         (MHCalibrationPix &hist, MCalibrationPix &pix) const;
 
   Int_t ReadEnv        ( const TEnv &env, TString prefix, Bool_t print);