Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 6041)
+++ trunk/MagicSoft/Mars/Changelog	(revision 6042)
@@ -43,4 +43,8 @@
      - modify default calibration to equiv. photo-electrons
      - allow for setting of MC, Raw or Root-file type in callisto.rc
+
+   * callisto.rc
+     - updated conf. file
+
 
  2005/01/27 Thomas Bretz
Index: trunk/MagicSoft/Mars/callisto.rc
===================================================================
--- trunk/MagicSoft/Mars/callisto.rc	(revision 6041)
+++ trunk/MagicSoft/Mars/callisto.rc	(revision 6042)
@@ -52,5 +52,4 @@
 # -------------------------------------------------------------------------
 MJPedestalC1.ExtractSignal: MExtractTimeAndChargeDigitalFilter
-#MJPedestalC1.ExtractSignal: MExtractFixedWindowPeakSearch
 
 # -------------------------------------------------------------------------
@@ -58,10 +57,10 @@
 # weights file depending on what you are extracting
 # -------------------------------------------------------------------------
-MJPedestalC2.ExtractSignal.WeightsFile:      msignal/calibration_weights_UV.dat
-MJPedestalY2.ExtractSignal.WeightsFile:      msignal/cosmics_weights.dat
-MJPedestalY3.ExtractSignal.WeightsFile:      msignal/cosmics_weights.dat
-MJCalibration.ExtractSignal.WeightsFile:     msignal/calibration_weights_UV.dat
-MJCalibrateSignal.ExtractSignal.WeightsFile: msignal/cosmics_weights.dat
-
+MJPedestalC2.ExtractSignal.WeightsFile:          msignal/calibration_weights_UV.dat
+MJPedestalY2.ExtractSignal.WeightsFile:          msignal/cosmics_weights.dat
+MJPedestalY3.ExtractSignal.WeightsFile:          msignal/cosmics_weights.dat
+MJCalibration.ExtractSignal.WeightsFile:         msignal/calibration_weights_UV.dat
+MJCalibrateSignal.ExtractSignal.WeightsFile:     msignal/cosmics_weights.dat
+MJCalibrateSignal.ExtractInterlaced.WeightsFile: msignal/calibration_weights_UV.dat
 
 # -------------------------------------------------------------------------
@@ -69,5 +68,5 @@
 # -------------------------------------------------------------------------
 # Switch on relative time calibration
-# MJCalibration.RelTimeCalibration: Yes
+#MJCalibration.RelTimeCalibration: Yes
 # Switch on intensity calibration
 #MJCalibration.IntensityCalibration: Yes
@@ -156,5 +155,5 @@
 #MJCalibration.ExtractSignal.OffsetFromWindow:  1
 #MJCalibration.ExtractSignal.LoGainPeakShift:   0
-#MJCalibration.ExtractSignal.LoGainSwitch:    200
+MJCalibration.ExtractSignal.LoGainSwitch:     200
 
 # -------------------------------------------------------------------------
@@ -185,4 +184,36 @@
 #MJCalibration.MCalibrationChargeCalc.PheErrLimit:        3.5
 
+#MJCalibration.MHCalibrationChargeCam.Debug:        no
+#MJCalibration.MHCalibrationChargeCam.LoGain:       yes
+#MJCalibration.MHCalibrationChargeCam.Oscillations: yes
+#MJCalibration.MHCalibrationChargeCam.SizeCheck:    yes
+#MJCalibration.MHCalibrationChargeCam.Averageing:   yes
+#MJCalibration.MHCalibrationChargeCam.HiGainNbins:  500
+#MJCalibration.MHCalibrationChargeCam.HiGainFirst:  -100.5
+#MJCalibration.MHCalibrationChargeCam.HiGainLast:   1899.5
+#MJCalibration.MHCalibrationChargeCam.LoGainNbins:   500
+#MJCalibration.MHCalibrationChargeCam.LoGainFirst:  -100.5
+#MJCalibration.MHCalibrationChargeCam.LoGainLast:   899.5
+#MJCalibration.MHCalibrationChargeCam.TimeLowerLimit: 1. 
+MJCalibration.MHCalibrationChargeCam.TimeUpperLimit: 3. 
+#MJCalibration.MHCalibrationChargeCam.NumHiGainSaturationLimit: 0.02
+#MJCalibration.MHCalibrationChargeCam.NumLoGainSaturationLimit: 0.005 
+#MJCalibration.MHCalibrationChargeCam.ProbLimit:    0.0001
+#MJCalibration.MHCalibrationChargeCam.OverflowLimit: 0.005
+#MJCalibration.MHCalibrationChargeCam.PulserFrequency: 500
+
+#MJCalibration.MHCalibrationRelTimeCam.Debug:        no
+#MJCalibration.MHCalibrationRelTimeCam.LoGain:       no
+#MJCalibration.MHCalibrationRelTimeCam.Oscillations:  yes
+#MJCalibration.MHCalibrationRelTimeCam.SizeCheck:    yes
+#MJCalibration.MHCalibrationRelTimeCam.Averageing:   yes
+#MJCalibration.MHCalibrationRelTimeCam.HiGainNbins:  210
+#MJCalibration.MHCalibrationRelTimeCam.HiGainFirst:  -5.
+#MJCalibration.MHCalibrationRelTimeCam.HiGainLast:   10.
+#MJCalibration.MHCalibrationRelTimeCam.NumHiGainSaturationLimit: 0.25
+#MJCalibration.MHCalibrationRelTimeCam.ProbLimit:    0.00001
+#MJCalibration.MHCalibrationRelTimeCam.OverflowLimit: 0.005
+#MJCalibration.MHCalibrationRelTimeCam.PulserFrequency: 500
+
 # -------------------------------------------------------------------------
 # Use this to change the behaviour of the calibration
@@ -220,7 +251,4 @@
 #MJPedestalY2.DataCheck: No
 #MJPedestalY3.DataCheck: No
-#MJPedestalY1.Display: None
-#MJPedestalY2.Display: None
-#MJPedestalY3.Display: None
 #MJPedestalY1.UseData: Yes
 #MJPedestalY2.UseData: Yes
@@ -253,9 +281,7 @@
 
 # -------------------------------------------------------------------------
-# Use this if you want to change the initialization of the signal extractor
-# -------------------------------------------------------------------------
-#MJCalibrateSignal.ExtractSignal.LoGainSwitch:    200
-#MJCalibrateSignal.ExtractSignal.HiGainFirst:     2
-#MJCalibrateSignal.ExtractSignal.HiGainLast:     16
+# Use this if you want to change the signal extractor
+# -------------------------------------------------------------------------
+#MJCalibrateSignal.ExtractSignal.LoGainSwitch:    150
 
 # -------------------------------------------------------------------------
@@ -263,15 +289,20 @@
 # -------------------------------------------------------------------------
 # Used for data-check (eg. raw files are read)
-#MJCalibrateSignal.DataCheck: No
+#MJCalibrateSignal.RawData: no
+# Used for MC
+#MJCalibrateSignal.MC: no
 #MJCalibrateSignal.MCalibrateData.PedestalFlag: Event
 #MJCalibrateSignal.MCalibrateData.CalibrationMode: Default
-#MJCalibrateSignal.MCalibrateData.SignalType: Default
+
+#MJCalibrateSignal.Interlaced: yes
+#MJCalibrateSignal.RelTimesUpdate: no
+#MJCalibrateSignal.HiLoCalibration: no
 
 # -------------------------------------------------------------------------
 # Setup level for determining of bad pixels
 # -------------------------------------------------------------------------
-MJCalibrateSignal.MBadPixelsCalc.PedestalLevel:         3.0
-MJCalibrateSignal.MBadPixelsCalc.PedestalLevelVariance: 3.0
-#MJCalibrateSignal.MBadPixelsTreat.NumMinNeighbors:    2
+#MJCalibrateSignal.MBadPixelsCalc.PedestalLevel:         3.0
+#MJCalibrateSignal.MBadPixelsCalc.PedestalLevelVariance: 3.0
+#MJCalibrateSignal.MBadPixelsTreat.NumMinNeighbors:    3
 #MJCalibrateSignal.MBadPixelsTreat.UseInterpolation:   yes
 #MJCalibrateSignal.MBadPixelsTreat.ProcessPedestalEvt: yes
@@ -280,2 +311,42 @@
 #MJCalibrateSignal.MBadPixelsTreat.UseCentralPixel:    no
 #MJCalibrateSignal.MBadPixelsTreat.HardTreatment:      no
+
+# -------------------------------------------------------------------------
+# Setup interlaced calibration events
+# -------------------------------------------------------------------------
+#MJCalibrateSignal.MHCalibrationChargeCam.Debug:        no
+#MJCalibrateSignal.MHCalibrationChargeCam.LoGain:       yes
+MJCalibrateSignal.MHCalibrationChargeCam.Oscillations:  no
+#MJCalibrateSignal.MHCalibrationChargeCam.SizeCheck:    yes
+#MJCalibrateSignal.MHCalibrationChargeCam.Averageing:   yes
+#MJCalibrateSignal.MHCalibrationChargeCam.HiGainNbins:  500
+#MJCalibrateSignal.MHCalibrationChargeCam.HiGainFirst:  -100.5
+#MJCalibrateSignal.MHCalibrationChargeCam.HiGainLast:   1899.5
+MJCalibrateSignal.MHCalibrationChargeCam.LoGainNbins:   250
+#MJCalibrateSignal.MHCalibrationChargeCam.LoGainFirst:  -100.5
+#MJCalibrateSignal.MHCalibrationChargeCam.LoGainLast:   899.5
+#MJCalibrateSignal.MHCalibrationChargeCam.TimeLowerLimit: 1. 
+MJCalibrateSignal.MHCalibrationChargeCam.TimeUpperLimit: 3. 
+#MJCalibrateSignal.MHCalibrationChargeCam.NumHiGainSaturationLimit: 0.02
+#MJCalibrateSignal.MHCalibrationChargeCam.NumLoGainSaturationLimit: 0.005 
+#MJCalibrateSignal.MHCalibrationChargeCam.ProbLimit:    0.0001
+#MJCalibrateSignal.MHCalibrationChargeCam.OverflowLimit: 0.005
+MJCalibrateSignal.MHCalibrationChargeCam.PulserFrequency: 50
+
+# -------------------------------------------------------------------------
+# Setup relative time interlaced calibration
+# -------------------------------------------------------------------------
+#MJCalibrateSignal.MHCalibrationRelTimeCam.Debug:        no
+#MJCalibrateSignal.MHCalibrationRelTimeCam.LoGain:       no
+MJCalibrateSignal.MHCalibrationRelTimeCam.Oscillations:  no
+#MJCalibrateSignal.MHCalibrationRelTimeCam.SizeCheck:    yes
+#MJCalibrateSignal.MHCalibrationRelTimeCam.Averageing:   yes
+#MJCalibrateSignal.MHCalibrationRelTimeCam.HiGainNbins:  210
+#MJCalibrateSignal.MHCalibrationRelTimeCam.HiGainFirst:  -5.
+#MJCalibrateSignal.MHCalibrationRelTimeCam.HiGainLast:   10.
+#MJCalibrateSignal.MHCalibrationRelTimeCam.NumHiGainSaturationLimit: 0.25
+#MJCalibrateSignal.MHCalibrationRelTimeCam.ProbLimit:    0.00001
+#MJCalibrateSignal.MHCalibrationRelTimeCam.OverflowLimit: 0.005
+MJCalibrateSignal.MHCalibrationRelTimeCam.PulserFrequency: 50
+
+