Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 8273)
+++ trunk/MagicSoft/Mars/Changelog	(revision 8274)
@@ -18,4 +18,20 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2007/01/27 Thomas Bretz
+
+   * manalysis/MMcCalibrationUpdate.cc:
+     - fixed a typo in a comment
+
+   * mcalib/MCalibrateData.[h,cc]:
+     - commented out some obsolete currently unused code
+
+   * mdata/MDataPhrase.cc:
+     - added a sanity check
+
+   * mpedestal/MMcPedestalCopy.cc:
+     - Changed output to fit the structure used in all other classes
+
+
 
  2007/01/27 Daniela Dorner
Index: trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc	(revision 8273)
+++ trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc	(revision 8274)
@@ -27,5 +27,5 @@
 //  MMcCalibrationUpdate
 //
-//  This task looks for the ìnformation about FADC pedestals in
+//  This task looks for the information about FADC pedestals in
 //  MMcFadcHeader and translates it to the pedestal mean and rms (in adc counts).
 //  If not already existing in the parameter list, an MCalibrationCam object
Index: trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc	(revision 8273)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc	(revision 8274)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MCalibrateData.cc,v 1.61 2006-10-19 13:58:29 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MCalibrateData.cc,v 1.62 2007-01-29 12:46:55 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -159,6 +159,6 @@
     : fGeomCam(NULL),   fBadPixels(NULL), fCalibrations(NULL), fIntensCalib(NULL),
       fQEs(NULL), fIntensQE(NULL), fSignals(NULL), fCerPhotEvt(NULL), fCalibConstCam(NULL),
-      fIntensConst(NULL), fPedestalFlag(kNo), fSignalType(kPhot), fRenormFactor(1.),
-      fScaleFactor(1.)
+    fIntensConst(NULL), /*fPedestalExt(NULL), fPedestalRndm(NULL), fPedPhotCam(NULL),*/
+    fPedestalFlag(kNo), fSignalType(kPhot), fRenormFactor(1.), fScaleFactor(1.)
 {
 
@@ -216,4 +216,23 @@
         return kFALSE;
     }
+    /*
+    fPedPhotCam = (MPedPhotCam*)pList->FindCreateObj("MPedPhotCam");
+    if (!fPedPhotCam)
+        return kFALSE;
+
+    fPedestalExt  = (MPedestalCam*)pList->FindObject("MPedestalFromExtractor", "MPedestalCam");
+    if (!fPedestalExt)
+    {
+        *fLog << err << "MPedestalFromExtractor [MPedestalCam] not found ... aborting" << endl;
+        return kFALSE;
+    }
+    /*
+    fPedestalRndm = (MPedestalCam*)pList->FindObject("MPedestalFromExtractorRndm", "MPedestalCam");
+    if (!fPedestalRndm)
+    {
+        *fLog << err << "MPedestalFromExtractorRndm [MPedestalCam] not found ... aborting" << endl;
+        return kFALSE;
+    }
+    */
 
     fSignals    = 0;
@@ -795,5 +814,4 @@
         } /* if (data) */
       
-
         if (pedestal)
         {
@@ -816,7 +834,19 @@
               (*pedphot)[pixidx].Set(mean, rms);
               pedphot->SetReadyToSave();
+              //break;
             }
+           /*
+            const Double_t mean = (*fPedestalExt)[pixidx].GetPedestal()    * pedmeancalib;
+            const Double_t rms  = (*fPedestalExt)[pixidx].GetPedestalRms() * pedrmscalib;
+
+            (*fPedPhotCam)[pixidx].Set(mean, rms);
+            fPedPhotCam->SetReadyToSave();
+            */
         } /* if (pedestal) */
     }
+
+    // Now we should take the bias (MPedPhotExtractor/Mean) and
+    // pedestal rms (MPedPhotExtractorRndm/Rms) and store it
+    // into MSignalPix
 
     if (data)
Index: trunk/MagicSoft/Mars/mcalib/MCalibrateData.h
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrateData.h	(revision 8273)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrateData.h	(revision 8274)
@@ -72,4 +72,7 @@
   MCalibConstCam                 *fCalibConstCam; //! Temporary calib consts storage
   MCalibrationIntensityConstCam  *fIntensConst;   //! Temporary calib consts storage
+//  MPedestalCam                   *fPedestalExt;   //! Input container for calibrated pedestal
+//  MPedestalCam                   *fPedestalRndm;  //! Input container for calibrated pedestal
+//  MPedPhotCam                    *fPedPhotCam;    //! Output container for calibrated pedestal
   
   CalibrationMode_t fCalibrationMode;    // Flag defining the calibration mode (CalibrationMode_t)
@@ -90,7 +93,7 @@
   MArrayF fHiLoConv;                     //! Array of calibration constants for each pixel, calculated only once!
   MArrayF fHiLoConvErr;                  //! Array of calibration F-Factors for each pixel, calculated only once!  
-  
+
   Int_t  Calibrate(Bool_t data, Bool_t pedestal) const;
-  
+
   Int_t  PreProcess(MParList *pList);
   Bool_t ReInit(MParList *pList);
@@ -98,9 +101,9 @@
   Int_t  ReadEnv(const TEnv &env, TString prefix, Bool_t print);
   void   StreamPrimitive(ostream &out) const;
-  
+
 public:
     MCalibrateData(CalibrationMode_t calmode=gkDefault,
                    const char *name=NULL, const char *title=NULL);
-  
+
   void   AddPedestal(const char *name="Cam");
   void   AddPedestal(const char *pedestal, const char *pedphot);
Index: trunk/MagicSoft/Mars/mdata/MDataPhrase.cc
===================================================================
--- trunk/MagicSoft/Mars/mdata/MDataPhrase.cc	(revision 8273)
+++ trunk/MagicSoft/Mars/mdata/MDataPhrase.cc	(revision 8274)
@@ -519,4 +519,10 @@
 Bool_t MDataPhrase::PreProcess(const MParList *plist)
 {
+    if (!fFormula)
+    {
+        *fLog << err << "Error - So far no valid phrase was setup." << endl;
+        return kFALSE;
+    }
+
     TIter Next(&fMembers);
 
Index: trunk/MagicSoft/Mars/mpedestal/MMcPedestalCopy.cc
===================================================================
--- trunk/MagicSoft/Mars/mpedestal/MMcPedestalCopy.cc	(revision 8273)
+++ trunk/MagicSoft/Mars/mpedestal/MMcPedestalCopy.cc	(revision 8274)
@@ -90,6 +90,4 @@
 }
 
-
-
 // --------------------------------------------------------------------------
 //
@@ -98,8 +96,5 @@
 Int_t  MMcPedestalCopy::PreProcess(MParList *pList)
 {
-  if ( ! pList->FindObject(AddSerialNumber("MPedestalCam")) )
-    pList->FindCreateObj(AddSerialNumber("MPedestalCam"));
-
-  return kTRUE;
+    return pList->FindCreateObj(AddSerialNumber("MPedestalCam")) ? kTRUE : kFALSE;
 }
 
@@ -127,5 +122,5 @@
     if (!fadc)
     {
-        *fLog << err << dbginf << "MMcFadcHeader not found... aborting." << endl;
+        *fLog << err << "MMcFadcHeader not found... aborting." << endl;
         return kFALSE;
     }
@@ -133,9 +128,8 @@
     MPedestalCam *pedcam = (MPedestalCam*)pList->FindObject(AddSerialNumber("MPedestalCam"));
     if (!pedcam)
-      {
-        *fLog << err << dbginf << "Cannot create " << AddSerialNumber("MPedestalCam") <<"... Exiting." << endl;
-
+    {
+        *fLog << err << "MPedestalCam not found... aborting." << endl;
         return kFALSE;
-      }
+    }
 
     MMcRunHeader *mcrun = (MMcRunHeader*)pList->FindObject(AddSerialNumber("MMcRunHeader"));