Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 3444)
+++ trunk/MagicSoft/Mars/Changelog	(revision 3445)
@@ -2,14 +2,50 @@
 to   send  a   Changelog   file  to  a  line  printer  directly.  Thanks.
 
+For your entries please follow this style:
+
+_yyyy/mm/dd:_[Your Name]
+_
+___*_filename:
+_____-_description
+_
+___*_filename2, filename3:
+_____-_description
+_
+_
+_
+
+While an underscore is a placeholder for a white-space or an empty line.
 
                                                  -*-*- END OF LINE -*-*-
+ 2004/03/09: Thomas Bretz
+
+   * Makefile.rules:
+     - replaced *.o by $(...) for building archives
+
+   * mjobs/MJCalibration.cc:
+     - exchanged  apply  and merge task
+
+   * mjobs/MJCalibration.h, mjobs/MJExtractSignal.h, mjobs/MJPedestal.h:
+     - fixed some const-qualifiers
+
+   * mcalib/MHCalibrationChargeBlindPix.cc, 
+     mcalib/MHCalibrationChargeCam.cc,
+     mcalib/MHCalibrationChargePINDiode.cc
+     - removed some obsolete output when calling FindCreateObj
+     - changed some 'not found' output messages to be 'Mars-compliant'
+     - replaced some gLog by *fLog
+
+
+
  2004/03/08: Markus Gaug
    
-  * mbadpixels/MBadPixelsPix.h
+   * mbadpixels/MBadPixelsPix.h
      - small modifications for better readability
      - remove Getters for calibration methods
 
-  * mcalib/MCalibrationChargeCam.cc
+   * mcalib/MCalibrationChargeCam.cc
      - displaying saturation also for not-valid pixels in GetPixelContent
+
+
 
  2004/03/08: Thomas Bretz
Index: trunk/MagicSoft/Mars/Makefile.rules
===================================================================
--- trunk/MagicSoft/Mars/Makefile.rules	(revision 3444)
+++ trunk/MagicSoft/Mars/Makefile.rules	(revision 3445)
@@ -3,5 +3,5 @@
 $(LIB): $(OBJS) $(CINT)Cint.o
 	@echo " - Building Library lib$(LIB)"
-	$(AR) $(LIB) *.o
+	$(AR) $(LIB) $(OBJS) $(CINT)Cint.o
 	@echo " "
 
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 3444)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 3445)
@@ -348,9 +348,9 @@
 
       if (bad.IsBad())
-        {
+      {
           pix.SetExcluded();
           continue;
-        }
-      
+      }
+
       pix.SetAbsTimeBordersHiGain(fSignals->GetFirstUsedSliceHiGain(),
                                   fSignals->GetLastUsedSliceHiGain());
Index: trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindPix.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindPix.cc	(revision 3444)
+++ trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindPix.cc	(revision 3445)
@@ -241,5 +241,5 @@
     if (!fRawEvt)
     {
-      *fLog << err << dbginf << "MRawEvtData not found... aborting." << endl;
+      *fLog << err << "MRawEvtData not found... aborting." << endl;
       return kFALSE;
     }
@@ -248,5 +248,5 @@
   if (!fSignal)
   {
-      *fLog << err << GetDescriptor() << ": ERROR: Could not find MExtractedSignalBlindPixel ... aborting " << endl;
+      *fLog << err << "MExtractedSignalBlindPixel not found... aborting " << endl;
       return kFALSE;
   }
@@ -262,8 +262,5 @@
   fBlindPix = (MCalibrationChargeBlindPix*)pList->FindCreateObj("MCalibrationChargeBlindPix");
   if (!fBlindPix)
-  {
-      *fLog << err << GetDescriptor() << ": ERROR: Could not find MCalibrationChargeBlindPix ... aborting " << endl;
-      return kFALSE;
-  }
+      return kFALSE;
 
   return kTRUE;
Index: trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc	(revision 3444)
+++ trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc	(revision 3445)
@@ -275,16 +275,14 @@
   
   fRawEvt = (MRawEvtData*)pList->FindObject("MRawEvtData");
-
   if (!fRawEvt)
   {
-      gLog << err << dbginf << "MRawEvtData not found... aborting." << endl;
+      *fLog << err << dbginf << "MRawEvtData not found... aborting." << endl;
       return kFALSE;
   }
 
   fGeom = (MGeomCam*)pList->FindObject("MGeomCam");
-
   if (!fGeom)
   {
-      gLog << err << dbginf << "MGeomCam not found... aborting." << endl;
+      *fLog << err << "MGeomCam not found... aborting." << endl;
       return kFALSE;
   }
@@ -306,23 +304,17 @@
   fBadPixels = (MBadPixelsCam*)pList->FindCreateObj("MBadPixelsCam");
   if (!fBadPixels)
+      return kFALSE;
+
+
+  fCam = (MCalibrationChargeCam*)pList->FindCreateObj("MCalibrationChargeCam");
+  if (!fCam)
+      return kFALSE;
+
+  MExtractedSignalCam *signal = (MExtractedSignalCam*)pList->FindObject("MExtractedSignalCam");
+  if (!signal)
   {
-      gLog << err << GetDescriptor() << ": ERROR: Could not find MBadPixelsCam ... aborting " << endl;
+      *fLog << err << "MExtractedSignalCam not found... abort." << endl;
       return kFALSE;
   }
-
-
-  fCam = (MCalibrationChargeCam*)pList->FindCreateObj("MCalibrationChargeCam");
-  if (!fCam)
-  {
-      gLog << err << GetDescriptor() << ": ERROR: Could not find MCalibrationChargeCam ... aborting " << endl;
-      return kFALSE;
-  }
-
-  MExtractedSignalCam *signal = (MExtractedSignalCam*)pList->FindObject("MExtractedSignalCam");
-  if (!signal)
-    {
-      gLog << err << "No argument in MExtractedSignalCam::ReInit... abort." << endl;
-      return kFALSE;
-    }
 
   const Int_t n = signal->GetSize();
@@ -382,5 +374,5 @@
   if (!signal)
     {
-      gLog << err << "No argument in MExtractedSignalCam::Fill... abort." << endl;
+      *fLog << err << "No argument in MExtractedSignalCam::Fill... abort." << endl;
       return kFALSE;
     }
@@ -390,5 +382,5 @@
   if (fHiGainArray->GetEntries() != n)
     {
-      gLog << err << "ERROR - Size mismatch... abort." << endl;
+      *fLog << err << "ERROR - Size mismatch... abort." << endl;
       return kFALSE;
     }
@@ -396,5 +388,5 @@
   if (fLoGainArray->GetEntries() != n)
     {
-      gLog << err << "ERROR - Size mismatch... abort." << endl;
+      *fLog << err << "ERROR - Size mismatch... abort." << endl;
       return kFALSE;
     }
Index: trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePINDiode.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePINDiode.cc	(revision 3444)
+++ trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePINDiode.cc	(revision 3445)
@@ -134,5 +134,5 @@
   if (!fPINDiode)
   {
-      *fLog << err << GetDescriptor() << ": ERROR: Could not find MCalibrationChargePINDiode ... aborting " << endl;
+      *fLog << err << "MCalibrationChargePINDiode not found... aborting " << endl;
       return kFALSE;
   }
@@ -163,5 +163,5 @@
   if (fExtractSlices != 0. && slices != fExtractSlices )
     {
-      gLog << err << "Number of used signal slices changed in MExtractedSignalCam  ... abort." 
+      *fLog << err << "Number of used signal slices changed in MExtractedSignalCam  ... abort."
            << endl;
       return kFALSE;
Index: trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 3444)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 3445)
@@ -508,7 +508,7 @@
     MCalibrationChargeCalc   calcalc;
 
-    MFillH fillpin(  "MHCalibrationChargePINDiode" , "MExtractedSignalPINDiode"   );
-    MFillH fillblind("MHCalibrationChargeBlindPix" , "MExtractedSignalBlindPixel" );
-    MFillH fillcam  ("MHCalibrationChargeCam"      , "MExtractedSignalCam"        );
+    MFillH fillpin  ("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode");
+    MFillH fillblind("MHCalibrationChargeBlindPix", "MExtractedSignalBlindPixel");
+    MFillH fillcam  ("MHCalibrationChargeCam",      "MExtractedSignalCam");
     // 
     // Apply a filter against cosmics
@@ -522,6 +522,6 @@
 
     tlist.AddToList(&read);
+    tlist.AddToList(&merge);
     tlist.AddToList(&apply);
-    tlist.AddToList(&merge);
     tlist.AddToList(&extract);
     tlist.AddToList(&pinext);  
Index: trunk/MagicSoft/Mars/mjobs/MJCalibration.h
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibration.h	(revision 3444)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibration.h	(revision 3445)
@@ -40,8 +40,8 @@
     TString GetOutputFile() const;
 
-    const MCalibrationChargeCam &GetCalibrationCam() const { return fCalibrationCam; }
-    const MBadPixelsCam         &GetBadPixels()      const { return fBadPixels; }
+    MCalibrationChargeCam &GetCalibrationCam() { return fCalibrationCam; }
+    const MBadPixelsCam &GetBadPixels() const { return fBadPixels; }
 
-    void SetBadPixels(MBadPixelsCam &bad) { bad.Copy(fBadPixels); }
+    void SetBadPixels(const MBadPixelsCam &bad) { bad.Copy(fBadPixels); }
 
     Bool_t ReadCalibrationCam();
Index: trunk/MagicSoft/Mars/mjobs/MJExtractSignal.h
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJExtractSignal.h	(revision 3444)
+++ trunk/MagicSoft/Mars/mjobs/MJExtractSignal.h	(revision 3445)
@@ -44,8 +44,8 @@
     TString GetOutputFileD() const;
 
-    const MPedPhotCam   &GetPedPhotCam() const { return fPedPhotCam; }
+    MPedPhotCam &GetPedPhotCam() { return fPedPhotCam; }
     const MBadPixelsCam &GetBadPixels()  const { return fBadPixels; }
 
-    void SetBadPixels(MBadPixelsCam &bad) { bad.Copy(fBadPixels); }
+    void SetBadPixels(const MBadPixelsCam &bad) { bad.Copy(fBadPixels); }
 
     Bool_t ProcessD(MPedestalCam &pedcam);
Index: trunk/MagicSoft/Mars/mjobs/MJPedestal.h
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJPedestal.h	(revision 3444)
+++ trunk/MagicSoft/Mars/mjobs/MJPedestal.h	(revision 3445)
@@ -40,8 +40,8 @@
     TString GetOutputFile() const;
 
-    const MPedestalCam  &GetPedestalCam() const { return fPedestalCam; }
-    const MBadPixelsCam &GetBadPixels()   const { return fBadPixels; }
+    MPedestalCam &GetPedestalCam() { return fPedestalCam; }
+    const MBadPixelsCam &GetBadPixels() const { return fBadPixels; }
 
-    void SetBadPixels(MBadPixelsCam &bad) { bad.Copy(fBadPixels); }
+    void SetBadPixels(const MBadPixelsCam &bad) { bad.Copy(fBadPixels); }
 
     Bool_t ProcessFile();