Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 6918)
+++ trunk/MagicSoft/Mars/Changelog	(revision 6919)
@@ -22,4 +22,34 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2005/04/08 Markus Gaug (2005/04/07)
+
+   * mhcalib/MHCalibrationChargeCam.cc:
+     - UNDOCUMENTED CHANGE: Do not call histlo.CreateFourierSpectrum()
+       if IsOscillations()
+
+   * mjobs/MJCalibrateSignal.cc:
+     - UNDOCUMENTED CHANGE: Set SetOscillations(kFALSE) for
+       hchacam, hbndcam, hrelcam
+
+   * mhcalib/MHCalibrationRelTimeCam.cc:
+     - fill array only if IsOscillations() is true. This is the case in 
+       all classes deriving from MHCalibrationCam, except for this one! 
+       The effect was that the interlaced calib. events occupied more 
+       and more memory becoming slower and slower because the option: 
+       SetOscillations(kFALSE) was not treated correctly. 
+
+   * mjobs/pedestalref_Dec04.rc
+     - update the reference lines in the display according to the spline
+       extractor.
+
+   * mjobs/MJCalibration.cc
+     - clarify a mis-leading histogram title
+
+   * callisto_Dec04Jan05.rc:
+     - UNDOCUMENTED CHANGE: use the pedestref_Dec04.rc as reference
+       file.
+
+
+
  2005/04/08 Thomas Bretz
 
@@ -44,4 +74,8 @@
        a spectrum
 
+   * mjobs/MJCalibrateSignal.cc:
+     - removed condition IsUseBlindPixel() and IsUsePINDiode from
+       setting filter and applied it to the corresponding task
+
 
 
@@ -117,7 +151,7 @@
 
    * msignal/MExtractTimeAndChargeDigitalFilter.cc
-     - moved fgOffsetFromLogain from -1.8 to -2.5. This corrects only an 
+     - moved fgOffsetFromLogain from -1.8 to -2.8. This corrects only an 
        defective extraction of the MC at low-gain signals lower than 90 
-       phes. (IN THE CODE THE CHANGE IS FROM -1.8 to -2.8!!!!)
+       phes.
 
 
Index: trunk/MagicSoft/Mars/callisto_Dec04Jan05.rc
===================================================================
--- trunk/MagicSoft/Mars/callisto_Dec04Jan05.rc	(revision 6918)
+++ trunk/MagicSoft/Mars/callisto_Dec04Jan05.rc	(revision 6919)
@@ -40,6 +40,6 @@
 # reference lines in the status display
 # -------------------------------------------------------------------------
-#MJPedestalC1.ReferenceFile: mjobs/pedestalref.rc
-#MJPedestalC2.ReferenceFile: mjobs/pedestalref.rc
+MJPedestalC1.ReferenceFile: mjobs/pedestalref_Dec04.rc
+MJPedestalC2.ReferenceFile: mjobs/pedestalref_Dec04.rc
 MJCalibration.ReferenceFile: mjobs/calibrationref_Dec04.rc
 MJCalibration.MHCalibrationRelTimeCam.ReferenceFile: mjobs/calibrationref_Dec04.rc
Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc	(revision 6918)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc	(revision 6919)
@@ -988,5 +988,6 @@
           {
             *fLog << warn << "Saturated Lo Gain histogram in area idx: " << j << endl;
-            histlo.CreateFourierSpectrum();
+            if (IsOscillations())
+                histlo.CreateFourierSpectrum();
             continue;
           }
Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc	(revision 6918)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc	(revision 6919)
@@ -351,5 +351,8 @@
 
           MHCalibrationPix &histlo = (*this)(i);
-          histlo.FillHistAndArray(time-reftime);
+	  if (IsOscillations())
+              histlo.FillHistAndArray(time-reftime);
+          else
+              histlo.FillHist(time-reftime);
 
           fSumarealo  [aidx]   += time;
@@ -362,5 +365,9 @@
           const Float_t time = pix.GetArrivalTimeHiGain();
 
-          histhi.FillHistAndArray(time-reftime) ;
+          if (IsOscillations())
+              histhi.FillHistAndArray(time-reftime);
+          else
+              histhi.FillHist(time-reftime);
+
           fSumareahi  [aidx]   += time;
           fNumareahi  [aidx]   ++;
@@ -373,10 +380,16 @@
     {
       MHCalibrationPix &histhi = GetAverageHiGainArea(j);
-      histhi.FillHistAndArray(fNumareahi[j] == 0 ? 0. : fSumareahi[j]/fNumareahi[j]);
+      if (IsOscillations())
+          histhi.FillHistAndArray(fNumareahi[j] == 0 ? 0. : fSumareahi[j]/fNumareahi[j]);
+      else
+          histhi.FillHist(fNumareahi[j] == 0 ? 0. : fSumareahi[j]/fNumareahi[j]);
 
       if (IsLoGain())
         {
           MHCalibrationPix &histlo = GetAverageLoGainArea(j);
-          histlo.FillHistAndArray(fNumarealo[j] == 0 ? 0. : fSumarealo[j]/fNumarealo[j]);
+	  if (IsOscillations())
+              histlo.FillHistAndArray(fNumarealo[j] == 0 ? 0. : fSumarealo[j]/fNumarealo[j]);
+          else
+              histlo.FillHist(fNumarealo[j] == 0 ? 0. : fSumarealo[j]/fNumarealo[j]);
         }
     }
@@ -385,10 +398,16 @@
     {
       MHCalibrationPix &histhi = GetAverageHiGainSector(j);
-      histhi.FillHistAndArray(fNumsectorhi[j] == 0 ? 0. : fSumsectorhi[j]/fNumsectorhi[j]);
+      if (IsOscillations())
+          histhi.FillHistAndArray(fNumsectorhi[j] == 0 ? 0. : fSumsectorhi[j]/fNumsectorhi[j]);
+      else
+          histhi.FillHist(fNumsectorhi[j] == 0 ? 0. : fSumsectorhi[j]/fNumsectorhi[j]);
 
       if (IsLoGain())
         {
           MHCalibrationPix &histlo = GetAverageLoGainSector(j);
-          histlo.FillHistAndArray(fNumsectorlo[j] == 0 ? 0. : fSumsectorlo[j]/fNumsectorlo[j]);
+	  if (IsOscillations())
+              histlo.FillHistAndArray(fNumsectorlo[j] == 0 ? 0. : fSumsectorlo[j]/fNumsectorlo[j]);
+          else
+              histlo.FillHist(fNumsectorlo[j] == 0 ? 0. : fSumsectorlo[j]/fNumsectorlo[j]);
         }
     }
Index: trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 6918)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 6919)
@@ -344,4 +344,8 @@
     MHCalibrationChargePINDiode hpndiod;
     MHCalibrationRelTimeCam     hrelcam;
+
+    hchacam.SetOscillations(kFALSE);
+    hbndcam.SetOscillations(kFALSE);
+    hrelcam.SetOscillations(kFALSE);
 
     MCalibrationChargeCam      calcam;
@@ -730,8 +734,6 @@
 	filcam.SetFilter(&fcalib);
         filtme.SetFilter(&fcalib);
-        if (IsUseBlindPixel())
-            filbnd.SetFilter(&fcalib);
-        if (IsUsePINDiode())
-            filpin.SetFilter(&fcalib);
+        filbnd.SetFilter(&fcalib);
+        filpin.SetFilter(&fcalib);
 	chcalc.SetFilter(&fcalib);
 	recalc.SetFilter(&fcalib);
@@ -745,6 +747,8 @@
 	if (fIsRelTimesUpdate)
 	  tlist2.AddToList(&filtme);
-        tlist2.AddToList(&filbnd);
-        tlist2.AddToList(&filpin);
+        if (IsUseBlindPixel())
+            tlist2.AddToList(&filbnd);
+        if (IsUsePINDiode())
+            tlist2.AddToList(&filpin);
         tlist2.AddToList(&chcalc);
 	if (fIsRelTimesUpdate)
Index: trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 6918)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 6919)
@@ -327,5 +327,5 @@
     MHCamera disp4 (geomcam, "RSigmaPerCharge",   "Reduced Sigma per Charge");
     MHCamera disp5 (geomcam, "NumPhes",           "Number Photo-electrons");
-    MHCamera disp6 (geomcam, "ConvFADC2Phes",     "Conversion Factor to Phes");
+    MHCamera disp6 (geomcam, "ConvFADC2Phes",     "Phes per Charge (before flat-field)");
     MHCamera disp7 (geomcam, "TotalFFactor",      "Total F-Factor(F-Factor Method)");
     MHCamera disp8 (geomcam, "CascadesQEFFactor", "Cascades QE (F-Factor Method)");
@@ -452,5 +452,5 @@
 
     disp5.SetYTitle("Photo-electons [1]");
-    disp6.SetYTitle("Conv.Factor [PhE/FADC cnts]");
+    disp6.SetYTitle("Phes/<Q> [FADC cnts^{-1}]");
     disp7.SetYTitle("Total F-Factor [1]");