Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 6390)
+++ trunk/MagicSoft/Mars/Changelog	(revision 6391)
@@ -21,4 +21,11 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2005/02/12 Markus Gaug
+
+   * msignal/MExtractTimeAndChargeSpline.cc
+     - change default rise time to 0.5 and default fall time to 1.5
+
+
 
  2005/02/12 Abelardo Moralejo
Index: trunk/MagicSoft/Mars/callisto.rc
===================================================================
--- trunk/MagicSoft/Mars/callisto.rc	(revision 6390)
+++ trunk/MagicSoft/Mars/callisto.rc	(revision 6391)
@@ -34,4 +34,5 @@
 MJCalibration.ReferenceFile: mjobs/calibrationref_Nov04.rc
 MJCalibration.MHCalibrationRelTimeCam.ReferenceFile: mjobs/calibrationref_Nov04.rc
+MJCalibration.MHCalibrationChargeCam.ReferenceFile: mjobs/calibrationref_Nov04.rc
 
 # -------------------------------------------------------------------------
@@ -60,8 +61,38 @@
 # Define here an extractor which can be used for the December 04 data.
 # -------------------------------------------------------------------------
-#MJPedestalC1.ExtractSignal: MExtractTimeAndChargeSpline
-#MJCalibration.ExtractSignal.Amplitude
-#MJCalibrateSignal.ExtractSignal.Amplitude
-#MJCalibrateSignal.ExtractInterlaced.Amplitude
+#MJPedestalC1.ExtractSignal: MExtractTimeAndChargeSpline, MExtractTimeAndChargeDigitalFilterPeakSearch, MExtractTimeAndChargeSlidingWindow
+# -------------------------------------------------------------------------
+# Define here parameters valid for all extractors above
+# -------------------------------------------------------------------------
+#MJPedestalC1.ExtractSignal.HiGainFirst:         0
+#MJPedestalC1.ExtractSignal.HiGainLast:         15
+#MJPedestalC1.ExtractSignal.LoGainFirst:         3
+#MJPedestalC1.ExtractSignal.LoGainLast:         14
+#MJPedestalC1.ExtractSignal.SaturationLimit:   250
+#MJPedestalC1.ExtractSignal.OffsetLoGain:     1.51
+#MJPedestalC1.ExtractSignal.LoGainSwitch:      150
+#MJPedestalC1.ExtractSignal.LoGainStartShift: -2.8
+# -------------------------------------------------------------------------
+# Define here parameters valid for the spline:
+# -------------------------------------------------------------------------
+#MJPedestalC1.ExtractSignal.Resolution:        0.05
+#MJPedestalC1.ExtractSignal.RiseTimeHiGain:    0.5
+#MJPedestalC1.ExtractSignal.FallTimeHiGain:    1.5
+#MJPedestalC1.ExtractSignal.LoGainStretch:     1.5
+#MJPedestalC1.ExtractSignal.Integral:       (default)
+#MJPedestalC1.ExtractSignal.Amplitude:      (not default)
+# -------------------------------------------------------------------------
+# Define here parameters valid for the sliding window:
+# -------------------------------------------------------------------------
+#MJPedestalC1.ExtractSignal.HiGainWindowSize:     6
+#MJPedestalC1.ExtractSignal.LoGainWindowSize:     6
+# -------------------------------------------------------------------------
+# Define here parameters valid for the digital filter with peak search:
+# -------------------------------------------------------------------------
+#MJPedestalC1.ExtractSignal.OffsetLeftFromPeak:   3
+#MJPedestalC1.ExtractSignal.OffsetRightFromPeak:  3
+#MJPedestalC1.ExtractSignal.PeakSearchWindowSize: 2
+#MJPedestalC1.ExtractSignal.HiGainFailureLimit:  10
+#MJPedestalC1.ExtractSignal.LoGainFailureLimit:  25
 
 # -------------------------------------------------------------------------
@@ -162,13 +193,4 @@
 # and automatically the data extraction
 # -------------------------------------------------------------------------
-#MJCalibration.ExtractSignal.HiGainFirst:       1
-#MJCalibration.ExtractSignal.HiGainLast:       15
-#MJCalibration.ExtractSignal.LoGainFirst:       3
-#MJCalibration.ExtractSignal.LoGainLast:       14
-#MJCalibration.ExtractSignal.HiGainWindowSize:  6
-#MJCalibration.ExtractSignal.LoGainWindowSize:  6
-#MJCalibration.ExtractSignal.PeakSearchWindow:  4
-#MJCalibration.ExtractSignal.OffsetFromWindow:  1
-#MJCalibration.ExtractSignal.LoGainPeakShift:   0
 MJCalibration.ExtractSignal.LoGainSwitch:     200
 
@@ -218,5 +240,5 @@
 #MJCalibration.MHCalibrationChargeCam.NumHiGainSaturationLimit: 0.02
 #MJCalibration.MHCalibrationChargeCam.NumLoGainSaturationLimit: 0.005 
-#MJCalibration.MHCalibrationChargeCam.ProbLimit:    0.0001
+#MJCalibration.MHCalibrationChargeCam.ProbLimit:     0.00000001
 #MJCalibration.MHCalibrationChargeCam.OverflowLimit: 0.005
 #MJCalibration.MHCalibrationChargeCam.PulserFrequency: 500
@@ -235,10 +257,4 @@
 #MJCalibration.MHCalibrationRelTimeCam.PulserFrequency: 500
 
-# -------------------------------------------------------------------------
-# Use this to change the behaviour of the calibration
-# -------------------------------------------------------------------------
-#MJCalibration.MHCalibrationChargeCam.Debug:        no
-
-
  
 # ==========================================================================
@@ -303,10 +319,5 @@
 # -------------------------------------------------------------------------
 #MJCalibrateSignal.ExtractSignal.LoGainSwitch:    150
-#MJCalibrateSignal.ExtractSignal.HiGainFirst:       0
-#MJCalibrateSignal.ExtractSignal.HiGainLast:       20
-#MJCalibrateSignal.ExtractSignal.LoGainFirst:       0
-#MJCalibrateSignal.ExtractSignal.LoGainLast:       14
-#MJCalibrateSignal.ExtractInterlaced.HiGainFirst:   0
-#MJCalibrateSignal.ExtractInterlaced.HiGainLast:   14
+MJCalibrateSignal.ExtractSignal.LoGainSwitch:    150
 
 # -------------------------------------------------------------------------
@@ -337,27 +348,4 @@
 #MJCalibrateSignal.MBadPixelsTreat.UseCentralPixel:    no
 #MJCalibrateSignal.MBadPixelsTreat.HardTreatment:      no
-
-# -------------------------------------------------------------------------
-# Setup calibration histogramming
-# -------------------------------------------------------------------------
-#MJCalibration.MHCalibrationChargeCam.Debug:        no
-#MJCalibration.MHCalibrationChargeCam.LoGain:       no
-#MJCalibration.MHCalibrationChargeCam.Oscillations: no
-#MJCalibration.MHCalibrationChargeCam.SizeCheck:    yes
-#MJCalibration.MHCalibrationChargeCam.Averageing:   yes
-#MJCalibration.MHCalibrationChargeCam.HiGainNbins:   500
-#MJCalibration.MHCalibrationChargeCam.HiGainFirst:  -100.125
-#MJCalibration.MHCalibrationChargeCam.HiGainLast:   1899.875
-#MJCalibration.MHCalibrationChargeCam.LoGainNbins:   500
-#MJCalibration.MHCalibrationChargeCam.LoGainFirst:  -100.25
-#MJCalibration.MHCalibrationChargeCam.LoGainLast:    899.75
-#MJCalibration.MHCalibrationChargeCam.TimeLowerLimit: 1. 
-#MJCalibration.MHCalibrationChargeCam.TimeUpperLimit: 2. 
-#MJCalibration.MHCalibrationChargeCam.NumHiGainSaturationLimit: 0.02
-#MJCalibration.MHCalibrationChargeCam.NumLoGainSaturationLimit: 0.005 
-#MJCalibration.MHCalibrationChargeCam.ProbLimit:    0.0001
-#MJCalibration.MHCalibrationChargeCam.OverflowLimit: 0.005
-#MJCalibration.MHCalibrationChargeCam.PulserFrequency: 50
-
 
 # -------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.cc
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.cc	(revision 6390)
+++ trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.cc	(revision 6391)
@@ -155,6 +155,6 @@
 const Byte_t  MExtractTimeAndChargeSpline::fgLoGainLast     = 14;
 const Float_t MExtractTimeAndChargeSpline::fgResolution     = 0.05;
-const Float_t MExtractTimeAndChargeSpline::fgRiseTimeHiGain = 1.5;
-const Float_t MExtractTimeAndChargeSpline::fgFallTimeHiGain = 4.5;
+const Float_t MExtractTimeAndChargeSpline::fgRiseTimeHiGain = 0.5;
+const Float_t MExtractTimeAndChargeSpline::fgFallTimeHiGain = 1.5;
 const Float_t MExtractTimeAndChargeSpline::fgLoGainStretch  = 1.5;
 const Float_t MExtractTimeAndChargeSpline::fgOffsetLoGain   = 1.7;   // 5 ns