Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 5191)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 5192)
@@ -20,4 +20,10 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2004/10/05: Markus Gaug
+   
+  * mcalib/MCalibrationChargeCalc.cc
+    - fixed small bug for the case that multiple colours are found, but 
+      no intensity calibration is used.
+
  2004/10/05: Thomas Bretz
 
@@ -33,6 +39,4 @@
      - added mtrigger
      - added mhflux
-
-
 
  2004/10/05: Markus Meyer and Keiichi Mase
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 5191)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 5192)
@@ -592,17 +592,11 @@
     *fLog << (pattern >> i & 1);
   *fLog  << endl;
-  fPulserPattern = pattern;
-  
   //
   // Now retrieve the colour and check if not various colours have been used
   //
-  fPulserColor = MCalibrationCam::kNONE;
-  
-  if (fPulserPattern & kAnyGreen)
-      fPulserColor = MCalibrationCam::kGREEN;
-
-  if ((fPulserPattern & kAnyBlue ||
-       fPulserPattern & kAnyUV   ||
-       fPulserPattern & kCT1Pulser) && fPulserColor != MCalibrationCam::kNONE)
+  if ((pattern & kAnyBlue   ||
+       pattern & kAnyUV    ||
+       pattern & kAnyGreen ||
+       pattern & kCT1Pulser) && fPulserColor != MCalibrationCam::kNONE)
   {
       *fLog << err << "Multiple colours used simultaneously in calibration file. Will skip this part!" << endl;
@@ -610,13 +604,13 @@
   }
 
-  if (fPulserColor == MCalibrationCam::kNONE)
-  {
-      if (fPulserPattern & kAnyBlue)
-          fPulserColor = MCalibrationCam::kBLUE;
-      if (fPulserPattern & kAnyUV)
-          fPulserColor = MCalibrationCam::kUV;
-      if (fPulserPattern & kCT1Pulser)
+  fPulserColor   = MCalibrationCam::kNONE;
+  fPulserPattern = pattern;
+  
+  if (fPulserPattern & kAnyBlue)
+    fPulserColor = MCalibrationCam::kBLUE;
+  if (fPulserPattern & kAnyUV)
+    fPulserColor = MCalibrationCam::kUV;
+  if (fPulserPattern & kCT1Pulser)
           fPulserColor = MCalibrationCam::kCT1;
-  }
 
   *fLog << inf << "Found new colour ... " << flush;
@@ -1716,5 +1710,5 @@
         }
 
-      lowlim  [i] = 1.1;   // Lowest known F-Factor of a PMT
+      lowlim  [i] = 1.;   // Lowest known F-Factor of a PMT
       upplim  [i] = avffactorphotons[i] + fFFactorErrLimit*TMath::Sqrt(avffactorphotvar[i]);
 
@@ -1758,5 +1752,5 @@
             << Form("%4.2f+-%4.2f",mean,sigma) << endl;
 
-      lowlim  [i] = 1.1;
+      lowlim  [i] = 1.;
       upplim  [i] = mean  + fFFactorErrLimit*sigma;