Changeset 5047 for trunk/MagicSoft/Mars/mhcalib

Timestamp:

09/15/04 22:28:41 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhcalib

Files:

• MHCalibrationChargeBlindCam.cc (modified) (2 diffs)
• MHCalibrationChargeBlindCam.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.cc

@@ -323 +323 @@
   *fLog << endl;
 
+  MCalibrationBlindCam *blindcam = fIntensBlind ? fIntensBlind->GetCam() : fBlindCam;
+      
   for (Int_t i=0; i<fHiGainArray->GetSize(); i++)
     {
@@ -346 +348 @@
         }
 
-      MCalibrationBlindPix  &pix    = fIntensCam 
-        ? (MCalibrationBlindPix&)(*fIntensCam)[i] 
-        : (MCalibrationBlindPix&)(*fCam)[i];
+      MCalibrationBlindPix  &pix = (MCalibrationBlindPix&)(*blindcam)[i];
 
       FitBlindPixel(hist,pix);

trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.h

@@ -26 +26 @@
   Axis_t fSPheCut;                    // Signal value upon which event considered as single-phe
   
-  MRawEvtData *fRawEvt;                 //!  Raw event data
+  MRawEvtData *fRawEvt;               //!  Raw event data
 
 public:
@@ -32 +32 @@
   enum FitFunc_t { kEPoisson4, kEPoisson5,
                    kEPoisson6, kEPoisson7,
-                   kEPolya, kEMichele }; // Possible fit functions types (see MHCalibrationChargeBlindPix)
+                   kEPolya, kEMichele };    // Possible fit functions types (see MHCalibrationChargeBlindPix)
   
-  static const FitFunc_t fgFitFunc = kEPoisson4;    //! Default for fFitFunc
+  static const FitFunc_t fgFitFunc = kEPoisson4; //! Default for fFitFunc
 
 private:
 
-  FitFunc_t fFitFunc;                 // The actual fit function type
+  FitFunc_t fFitFunc;                              // The actual fit function type
   
   Bool_t SetupHists   (const MParList *pList );
@@ -58 +58 @@
   // Draw
   void  Draw(Option_t *opt="");
-  void  SetFitFunc( const FitFunc_t func=fgFitFunc)  { fFitFunc = func;  }
-  void  SetSPheCut( const Axis_t a=fgSPheCut )  { fSPheCut = a;  }    
+  void  SetFitFunc( const FitFunc_t func=fgFitFunc )  { fFitFunc = func;  }
+  void  SetSPheCut( const Axis_t    a   =fgSPheCut )  { fSPheCut = a;     }    
   
   ClassDef(MHCalibrationChargeBlindCam, 1)      // Histogram class for Blind Pixel Calibration