Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 4588)
+++ trunk/MagicSoft/Mars/Changelog	(revision 4589)
@@ -19,4 +19,11 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+  2004/08/12: Markus Gaug
+
+   * mcalib/MCalibrateData.[h,cc]
+     - some cosmetic changes
+     - change default calibration mode from blindpixel to ffactor
+
 
   2004/08/12: Thomas Bretz
Index: trunk/MagicSoft/Mars/mcalib/MCalibrateData.h
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrateData.h	(revision 4588)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrateData.h	(revision 4589)
@@ -4,16 +4,15 @@
 /////////////////////////////////////////////////////////////////////////////
 //                                                                         //
-// MCalibrateData
+// MCalibrateData                                                          //
 //                                                                         //
 // Integrates the desired ADC time slices of one pixel and apply           //
 // calibration constants                                                   //
 //                                                                         //
-// Differences between MCalibrateData and MCalibrate :
-// in MCalibrateData
-// - in ReInit the MPedPhot container is filled using
-//      - the pedstals/slice from MPedestalCam
-//      - the number of used FADC slices from MExtractedSignalCam   
-//      - the photon/ADC conversion factor from MCalibrationCam
-//                                                                         //
+// Differences between MCalibrateData and MCalibrate :                     //
+// in MCalibrateData                                                       //
+// - in ReInit the MPedPhot container is filled using                      //
+//      - the pedstals/slice from MPedestalCam                             //
+//      - the number of used FADC slices from MExtractedSignalCam          //
+//      - the photon/ADC conversion factor from MCalibrationCam            //
 //                                                                         //
 /////////////////////////////////////////////////////////////////////////////
@@ -35,71 +34,68 @@
 {
 private:
-    MGeomCam              *fCam;
-    MPedestalCam          *fPedestal;     // Pedestals/slice [ADC counts]
-    MPedestalCam          *fPedestalFromData;  // Pedestals/slice [ADC counts]
-    MBadPixelsCam         *fBadPixels;    // Bad Pixels information
-    MCalibrationChargeCam *fCalibrations; // Calibration constants
-    MCalibrationQECam     *fQEs;          // Quantum efficiencies
-    MExtractedSignalCam   *fSignals;      // Integrated charge in FADCs counts
 
-    MPedPhotCam           *fPedPhot;      // Pedestals/(used slices) [photons]
-    MPedPhotCam           *fPedPhotFromData;// Pedestals/(used slices) [photons]
-    MCerPhotEvt           *fCerPhotEvt;   // Cerenkov Photon Event used for calculation
+  MGeomCam              *fGeomCam;          //! Camera geometry container
+  MPedestalCam          *fPedestal;         //! Pedestals/slice [ADC counts]
+  MPedestalCam          *fPedestalFromData; //! Pedestals/slice [ADC counts]
+  MBadPixelsCam         *fBadPixels;        //! Bad Pixels information
+  MCalibrationChargeCam *fCalibrations;     //! Calibration constants
+  MCalibrationQECam     *fQEs;              //! Quantum efficiencies
+  MExtractedSignalCam   *fSignals;          //! Integrated charge in FADCs counts
+  
+  MPedPhotCam           *fPedPhot;          // Pedestals/(used slices) [photons]
+  MPedPhotCam           *fPedPhotFromData;  // Pedestals/(used slices) [photons]
+  MCerPhotEvt           *fCerPhotEvt;       // Cerenkov Photon Event used for calculation
+  
+  UShort_t fCalibrationMode;
+  Float_t  fConversionHiLo;
+  Int_t    fFlags;                          // Flags defining to calibrate the pedestal each event or each run
+  
+  TString  fNamePedADCRunContainer;         // name of fPedestal
+  TString  fNamePedADCEventContainer;       // name of fPedestalFromData
+  TString  fNamePedPhotRunContainer;        // name of fPedPhot
+  TString  fNamePedPhotEventContainer;      // name of fPedPhotFromData
 
-    Float_t fNumUsedHiGainFADCSlices;
-    Float_t fNumUsedLoGainFADCSlices;
-
-    Float_t  fConversionHiLo;
-    UShort_t fCalibrationMode;
-
-    Int_t        fFlags;            // Flags defining to calibrate the pedestal each event or each run
- 
-    TString fNamePedADCRunContainer;           // name of the 'MPedestalCam' container
-    TString fNamePedADCEventContainer;         // name of the 'MPedestalCam' container
-    TString fNamePedPhotRunContainer;          // name of the 'MPedestalCam' container
-    TString fNamePedPhotEventContainer;        // name of the 'MPedestalCam' container
-
-
-    Bool_t CalibratePedestal(MPedestalCam *, MPedPhotCam *);
-
-    Bool_t GetConversionFactor(UInt_t, 
+  Float_t  fNumUsedHiGainFADCSlices;
+  Float_t  fNumUsedLoGainFADCSlices;
+  
+  Bool_t   CalibratePedestal ( MPedestalCam *, MPedPhotCam * );
+  
+  Bool_t   GetConversionFactor(UInt_t, 
                                Float_t &, Float_t &, Float_t &, 
                                Float_t &, Float_t &);    
-
-    Int_t  PreProcess(MParList *pList);
-    Bool_t ReInit(MParList *pList);
-    Int_t  Process();
-
+  
+  Int_t    PreProcess( MParList *pList );
+  Bool_t   ReInit    ( MParList *pList );
+  Int_t    Process   ( );
+  
 public:
 
-    enum CalibrationMode_t{kNone=0,kFlatCharge=1,kBlindPixel,kFfactor,kPinDiode,kCombined, kDummy};
-    static const CalibrationMode_t kDefault = kBlindPixel;
+    enum CalibrationMode_t { kNone=0,kFlatCharge=1,
+	                     kBlindPixel,kFfactor,kPinDiode,kCombined, kDummy };
 
-    enum PedestalType_t{
-      kRun = BIT(0),
+    static const CalibrationMode_t kDefault = kFfactor;
+
+    enum PedestalType_t {
+      kRun   = BIT(0),
       kEvent = BIT(1)
     };
    
+    MCalibrateData( CalibrationMode_t calmode=kDefault,
+                    const char *name=NULL, const char *title=NULL);
 
+    void   DisablePedestalType( PedestalType_t i )                   { fFlags &= ~i;      } 
+    void   EnablePedestalType ( PedestalType_t i )                   { fFlags |=  i;      } 
+    void   SetPedestalType    ( PedestalType_t i )                   { fFlags  =  i;      } 
+    Bool_t TestFlag           ( PedestalType_t i ) const             { return fFlags & i; }
 
-    MCalibrateData(CalibrationMode_t calmode = kDefault,const char *name=NULL, const char *title=NULL);
+    void   SetCalibrationMode ( CalibrationMode_t calmode=kDefault ) { fCalibrationMode=calmode; }
+    void   SetConversionHiLo  ( Float_t conv                       ) { fConversionHiLo = conv;   }
 
-    void SetConversionHiLo(Float_t conv) { fConversionHiLo = conv; };
-    void SetCalibrationMode(CalibrationMode_t calmode=kDefault){ fCalibrationMode=calmode;};
+    void   SetNamePedADCRunContainer   ( const char *name)   { fNamePedADCRunContainer    = name; }
+    void   SetNamePedADCEventContainer ( const char *name)   { fNamePedADCEventContainer  = name; }
+    void   SetNamePedPhotRunContainer  ( const char *name)   { fNamePedPhotRunContainer   = name; }
+    void   SetNamePedPhotEventContainer( const char *name)   { fNamePedPhotEventContainer = name; }
 
-    void SetPedestalType(PedestalType_t i) { fFlags  =  i; } // Int_t f
-    void EnablePedestalType(PedestalType_t i)   { fFlags |=  i; } // Int_t f
-    void DisablePedestalType(PedestalType_t i)  { fFlags &= ~i; } // Int_t f
-    Bool_t TestFlag(PedestalType_t i) const { return fFlags&i; }
-
-
-    void SetNamePedADCRunContainer(const char *name)    { fNamePedADCRunContainer = name; }
-    void SetNamePedADCEventContainer(const char *name)    { fNamePedADCEventContainer = name; }
-
-    void SetNamePedPhotRunContainer(const char *name)    { fNamePedPhotRunContainer = name; }
-    void SetNamePedPhotEventContainer(const char *name)    { fNamePedPhotEventContainer = name; }
-
-    
-    ClassDef(MCalibrateData, 0)   // Task to calculate cerenkov photons using calibration constants
+    ClassDef(MCalibrateData, 0)   // Task to calibrate FADC counts into Cherenkov photons 
 };