Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 5571)
+++ trunk/MagicSoft/Mars/Changelog	(revision 5572)
@@ -32,4 +32,8 @@
    * callisto.cc:
      - more fixes to make calibration of signal (Y) work again
+
+   * callisto.rc:
+     - adapted to changes in callisto
+     - changed such that the digital filter is used as a default
 
    * mcalib/MCalibrateData.cc:
Index: trunk/MagicSoft/Mars/NEWS
===================================================================
--- trunk/MagicSoft/Mars/NEWS	(revision 5571)
+++ trunk/MagicSoft/Mars/NEWS	(revision 5572)
@@ -5,4 +5,11 @@
      values were lower than they should. This was more visible for high
      energy (Size) events.
+
+   - Made MExtractTimeAndChargeDigital Filter the default for callisto
+
+   - added a new loop to callisto to support the correct extraction of 
+     the pedestal and pedestal rms through the signal extractor
+
+
 
  *** Version 0.8.6 (2004/10/05)
Index: trunk/MagicSoft/Mars/callisto.rc
===================================================================
--- trunk/MagicSoft/Mars/callisto.rc	(revision 5571)
+++ trunk/MagicSoft/Mars/callisto.rc	(revision 5572)
@@ -58,6 +58,8 @@
 # -------------------------------------------------------------------------
 MJPedetslaC2.ExtractSignal.WeightsFile:      msignal/calibration_weights_UV.dat
+MJPedetslaY2.ExtractSignal.WeightsFile:      msignal/calibration_weights_UV.dat
 MJCalibration.ExtractSignal.WeightsFile:     msignal/calibration_weights_UV.dat
 MJCalibrateSignal.ExtractSignal.WeightsFile: msignal/cosmics_weights.dat
+
 
 # -------------------------------------------------------------------------
@@ -105,5 +107,5 @@
 # could be (if no pedestal file available) a data-file, too.
 # -------------------------------------------------------------------------
-MJPedestalC1.ExtractPedestal: MPedCalcFromLoGain
+#MJPedestalC1.ExtractPedestal: MPedCalcFromLoGain
 #MJPedestalC1.ExtractPedestal.ExtractWinFirst:    0
 #MJPedestalC1.ExtractPedestal.ExtractWinSize:     6
@@ -113,5 +115,5 @@
 #MJPedestalC1.ExtractPedestal.MaxHiGainVar:     40
 
-MJPedestalC2.ExtractPedestal: MPedCalcFromLoGain
+#MJPedestalC2.ExtractPedestal: MPedCalcFromLoGain
 #MJPedestalC2.ExtractPedestal.ExtractWinFirst:    0
 #MJPedestalC2.ExtractPedestal.ExtractWinSize:     6
@@ -206,8 +208,8 @@
 # If you want to change the behaviour of the pedestal extraction...
 # -------------------------------------------------------------------------
-#MJPedestalY1.UseData:   Yes
-#MJPedestalY2.UseData:   Yes
-#MJPedestalY1.MaxEvents: 750
-#MJPedestalY2.MaxEvents: 750
+#MJPedestalY1.UseData: Yes
+#MJPedestalY2.UseData: Yes
+MJPedestalY1.MaxEvents: 500
+MJPedestalY2.MaxEvents: 500
 
 #MJPedestalY.ExtractPedestal: MPedCalcFromLoGain
@@ -217,7 +219,16 @@
 # Setup pedestal extractor for running through data
 # -------------------------------------------------------------------------
+#MJCalibrateSignalAB.ExtractPedestal: MPedCalcFromLoGain
+#MJCalibrateSignalAB.ExtractPedestal.PedestalUpdate:   yes
+#MJCalibrateSignalAB.ExtractPedestal.NumEventsDump:   1500
+#MJCalibrateSignalAB.ExtractPedestal.ExtractWinFirst:  15
+#MJCalibrateSignalAB.ExtractPedestal.ExtractWinSize:    6
+#MJCalibrateSignalAB.ExtractPedestal.CheckWinFirst:     0
+#MJCalibrateSignalAB.ExtractPedestal.CheckWinSize:     29
+#MJCalibrateSignalAB.ExtractPedestal.MaxHiGainVar:     40
+
 #MJCalibrateSignal.ExtractPedestal: MPedCalcFromLoGain
 #MJCalibrateSignal.ExtractPedestal.PedestalUpdate:   yes
-#MJCalibrateSignal.ExtractPedestal.NumEventsDump:   500
+#MJCalibrateSignal.ExtractPedestal.NumEventsDump:   1500
 #MJCalibrateSignal.ExtractPedestal.ExtractWinFirst:  15
 #MJCalibrateSignal.ExtractPedestal.ExtractWinSize:    6