Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 7291)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 7292)
@@ -18,4 +18,10 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2005/08/18
+
+   * RELEASE 0.9.4.1
+
+
+
  2005/08/17 Thomas Bretz
 
Index: /trunk/MagicSoft/Mars/Makefile.conf.general
===================================================================
--- /trunk/MagicSoft/Mars/Makefile.conf.general	(revision 7291)
+++ /trunk/MagicSoft/Mars/Makefile.conf.general	(revision 7292)
@@ -18,5 +18,5 @@
 #   export MARSLIBS="-lX11 -lXpm -L/usr/X11R6/lib"
 #
-DEFINES	 = -DMARSVER=\"\<cvs\>\" -D__MARS__ -DROOTVER=\"$(ROOTVER)\" $(ARCHDEF) $(MARSDEFINES)
+DEFINES	 = -DMARSVER=\"0.9.4.1\" -D__MARS__ -DROOTVER=\"$(ROOTVER)\" $(ARCHDEF) $(MARSDEFINES)
 
 CXXFLAGS = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG) $(DEFINES)
Index: /trunk/MagicSoft/Mars/NEWS
===================================================================
--- /trunk/MagicSoft/Mars/NEWS	(revision 7291)
+++ /trunk/MagicSoft/Mars/NEWS	(revision 7292)
@@ -1,5 +1,5 @@
                                                                -*-*- END -*-*-
 
- *** Version <cvs>
+ *** Version 0.9.4.1 (2005/08/18)
 
    - callisto: fixed some problems with the calibration in case of
@@ -17,5 +17,5 @@
 
 
- *** Version 0.9.3 (2005/08/05)
+ *** Version 0.9.4 (2005/08/05)
 
    - general: Fixed the ZA binning. It didn't correctyl fit the
Index: /trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc	(revision 7291)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc	(revision 7292)
@@ -240,5 +240,5 @@
       }
   }
-      
+
   fNumCam    = 0;
   fNumEvents = 0;
@@ -287,8 +287,7 @@
 Int_t MCalibCalcFromPast::Process()
 {
-
   if (fNumEvents++ < fNumEventsDump)
     return kTRUE;
-  
+
   fNumEvents = 0;
   ReInitialize();
@@ -313,5 +312,5 @@
         {
             fNumFails++;
-            *fLog << warn << "WARNING - Finalization of charges failed the " << fNumFails << " time..." << endl;
+            *fLog << warn << "WARNING - Finalization of charges failed the " << fNumFails << ". time..." << endl;
         }
 
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 7291)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 7292)
@@ -739,12 +739,8 @@
       }
 
-  MCalibrationBlindCam  *blindcam  = fIntensBlind   
-    ? (MCalibrationBlindCam*)fIntensBlind->GetCam() : fBlindCam;
-  MCalibrationQECam     *qecam     = fIntensQE      
-    ? (MCalibrationQECam*)    fIntensQE->GetCam()   : fQECam;
-  MCalibrationChargeCam *chargecam = fIntensCam 
-    ? (MCalibrationChargeCam*)fIntensCam->GetCam()  : fCam;
-  MBadPixelsCam         *badcam    = fIntensBad 
-    ? (MBadPixelsCam*)        fIntensBad->GetCam()  : fBadPixels;
+  MCalibrationBlindCam  *blindcam  = fIntensBlind ? (MCalibrationBlindCam*) fIntensBlind->GetCam() : fBlindCam;
+  MCalibrationQECam     *qecam     = fIntensQE    ? (MCalibrationQECam*)    fIntensQE->GetCam()   : fQECam;
+  MCalibrationChargeCam *chargecam = fIntensCam   ? (MCalibrationChargeCam*)fIntensCam->GetCam()  : fCam;
+  MBadPixelsCam         *badcam    = fIntensBad   ? (MBadPixelsCam*)        fIntensBad->GetCam()  : fBadPixels;
 
   //
