Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 4591)
+++ trunk/MagicSoft/Mars/Changelog	(revision 4592)
@@ -23,7 +23,7 @@
 
    * mcalib/MCalibrateData.[h,cc]
+     - give defaults to the Setter functions
+     - change default calibration mode from blindpixel to ffactor
      - some cosmetic changes
-     - change default calibration mode from blindpixel to ffactor
-
 
 
Index: trunk/MagicSoft/Mars/mcalib/MCalibrateData.h
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrateData.h	(revision 4591)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrateData.h	(revision 4592)
@@ -71,35 +71,39 @@
 public:
 
-    enum CalibrationMode_t { kNone=0,kFlatCharge=1,
-	                     kBlindPixel,kFfactor,kPinDiode,kCombined, kDummy };
+  enum CalibrationMode_t { kNone=0,kFlatCharge=1,
+                           kBlindPixel,kFfactor,kPinDiode,kCombined, kDummy };
 
-    static const CalibrationMode_t kDefault = kFfactor;
+  static const CalibrationMode_t kDefault = kFfactor;
+  
+  enum PedestalType_t {
+    kNone  = BIT(0),
+    kRun   = BIT(1),
+    kEvent = BIT(2)
+  };
+  
+  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=kRun )              { fFlags  =  i;      } 
+  Bool_t TestFlag           ( PedestalType_t i      ) const        { return fFlags & i; }
+  
+  void   SetCalibrationMode ( CalibrationMode_t calmode=kDefault ) { fCalibrationMode=calmode; }
+  void   SetConversionHiLo  ( Float_t conv                       ) { fConversionHiLo = conv;   }
+  
+  void   SetNamePedADCRunContainer   ( const char *name="MPedestalCam" )         {
+    fNamePedADCRunContainer    = name; }
+  void   SetNamePedADCEventContainer ( const char *name="MPedestalCamFromData" ) {
+    fNamePedADCEventContainer  = name; }
+  void   SetNamePedPhotRunContainer  ( const char *name="MPedPhotCam" )          {
+    fNamePedPhotRunContainer   = name; }
+  void   SetNamePedPhotEventContainer( const char *name="MPedPhotCamFromData")   {
+    fNamePedPhotEventContainer = name; }
+  
+  ClassDef(MCalibrateData, 0)   // Task to calibrate FADC counts into Cherenkov photons 
+};
 
-    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; }
-
-    void   SetCalibrationMode ( CalibrationMode_t calmode=kDefault ) { fCalibrationMode=calmode; }
-    void   SetConversionHiLo  ( Float_t conv                       ) { fConversionHiLo = conv;   }
-
-    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 calibrate FADC counts into Cherenkov photons 
-};
- 
-
-#endif
+#endif   /* MCalibrateData */
 
 
@@ -108,5 +112,2 @@
 
 
-
-
-