Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 5514)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 5515)
@@ -26,6 +26,4 @@
      - InitArrays: added missing return statement
 
-
-
  2004/11/30: Markus Gaug
 
@@ -39,5 +37,11 @@
      - updated to new version of MPedCalcPedRun (only important for 
        intensity calibration)
-
+      
+   * msignal/MExtractTimeAndCharge.cc
+     - fixed bug for very high saturating signals setting the low-gain 
+       range wrong. 
+
+   * mcalib/MCalibrationChargeCalc.[h,cc]
+     - added variable containing the name of the requested MPedestalCam
 
 
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 5514)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 5515)
@@ -1,3 +1,2 @@
-
 /* ======================================================================== *\
 !
@@ -239,4 +238,5 @@
 const Float_t MCalibrationChargeCalc::fgPheErrLimit            = 4.5;
 const Float_t MCalibrationChargeCalc::fgFFactorErrLimit        = 4.5;
+const TString MCalibrationChargeCalc::fgNamePedestalCam = "MPedestalCam";
 // --------------------------------------------------------------------------
 //
@@ -258,4 +258,5 @@
 // - fLambdaCheckLimit  to fgLambdaCheckLimit 
 // - fLambdaErrLimit    to fgLambdaErrLimit 
+// - fNamePedestalCam   to fgNamePedestalCam
 // - fPheErrLimit       to fgPheErrLimit  
 // - fPulserColor       to MCalibrationCam::kCT1
@@ -287,4 +288,5 @@
   SetLambdaCheckLimit  ();
   SetLambdaErrLimit    ();
+  SetNamePedestalCam   ();
   SetPheErrLimit       ();
   SetOutputPath        ();
@@ -363,8 +365,8 @@
   // Containers that have to be there.
   //
-  fPedestals = (MPedestalCam*)pList->FindObject("MPedestalCam");
+  fPedestals = (MPedestalCam*)pList->FindObject("MPedestalCam", AddSerialNumber(fNamePedestalCam.Data()));
   if (!fPedestals)
     {
-      *fLog << err << "MPedestalCam not found... aborting" << endl;
+      *fLog << err << fNamePedestalCam.Data() << " not found... aborting" << endl;
       return kFALSE;
     }
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.h
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.h	(revision 5514)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.h	(revision 5515)
@@ -58,4 +58,6 @@
   static const Float_t fgFFactorErrLimit;      //! Default for fFFactorErrLimit    (now set to: 4.5)
  
+  static const TString fgNamePedestalCam;      //! "MPedestalCam"
+
   // Variables
   Float_t fChargeLimit;                        // Limit acceptance mean charge  (in units of PedRMS)
@@ -83,4 +85,5 @@
   TString fOutputPath;                         // Path to the output file
   TString fOutputFile;                         // Name of the output file  
+  TString fNamePedestalCam;                    // Name of the 'MPedestalCam' container
   
   // Pointers
@@ -116,5 +119,4 @@
 
   // functions
-  const char* GetOutputFile();
   void   FinalizePedestals       ( const MPedestalPix    &ped, MCalibrationChargePix &cal, const Int_t aidx );
   Bool_t FinalizeCharges         ( MCalibrationChargePix &cal, MBadPixelsPix &bad, const char* what);
@@ -129,5 +131,5 @@
   void   FinalizeUnsuitablePixels();
 
-  void   PrintUncalibrated( MBadPixelsPix::UncalibratedType_t typ, const char *text) const;
+  const char* GetOutputFile();
 
   // Query checks
@@ -138,4 +140,6 @@
   Bool_t IsCheckOscillations     () const { return TESTBIT(fCheckFlags,kCheckOscillations);      }  
   
+  void   PrintUncalibrated( MBadPixelsPix::UncalibratedType_t typ, const char *text) const;
+
   // Global fit results
   void   SetPheFitOK          ( const Int_t aidx, const Bool_t b=kTRUE ) {
@@ -197,4 +201,5 @@
   void SetLambdaErrLimit    ( const Float_t f=fgLambdaErrLimit         ) { fLambdaErrLimit    = f;     }
   void SetLambdaCheckLimit  ( const Float_t f=fgLambdaCheckLimit       ) { fLambdaCheckLimit  = f;     }
+  void SetNamePedestalCam   ( const char *name=fgNamePedestalCam.Data()) { fNamePedestalCam   = name;  }
   void SetOutputPath        ( TString path="."                   );
   void SetOutputFile        ( TString file="ChargeCalibStat.txt" );