Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 6476)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 6477)
@@ -21,4 +21,16 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2005/02/15 Thomas Bretz
+
+   * callisto.rc:
+     - replaced mutal exclusive options (Integral, Amplitude) by
+       a one-line resource
+
+   * msignal/MExtractTimeAndChargeSpline.cc:
+     - replaced mutal exclusive options (Integral, Amplitude) by
+       a one-line resource "ExtractionType" (old code still works)
+
+
 
  2005/02/15 Markus Gaug
Index: /trunk/MagicSoft/Mars/callisto.rc
===================================================================
--- /trunk/MagicSoft/Mars/callisto.rc	(revision 6476)
+++ /trunk/MagicSoft/Mars/callisto.rc	(revision 6477)
@@ -80,6 +80,6 @@
 #MJPedestalC1.ExtractSignal.FallTimeHiGain:    1.5
 #MJPedestalC1.ExtractSignal.LoGainStretch:     1.5
-#MJPedestalC1.ExtractSignal.Integral:       (default)
-#MJPedestalC1.ExtractSignal.Amplitude:      (not default)
+#MJPedestalC1.ExtractSignal.ExtractionType: Integral <default>
+#MJPedestalC1.ExtractSignal.ExtractionType: Amplitude
 # -------------------------------------------------------------------------
 # Define here parameters valid for the sliding window:
Index: /trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.cc
===================================================================
--- /trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.cc	(revision 6476)
+++ /trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.cc	(revision 6477)
@@ -1182,6 +1182,9 @@
 //
 // In addition to the resources of the base-class MExtractor:
-//   MJPedestal.MExtractor.WindowSizeHiGain: 6
-//   MJPedestal.MExtractor.WindowSizeLoGain: 6
+//   Resolution
+//   RiseTimeHiGain
+//   FallTimeHiGain
+//   LoGainStretch
+//   ExtractionType: amplitude, integral
 //
 Int_t MExtractTimeAndChargeSpline::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
@@ -1214,17 +1217,36 @@
 
   if (IsEnvDefined(env, prefix, "Amplitude", print))
-    {
+  {
       b = GetEnvValue(env, prefix, "Amplitude", IsExtractionType(kAmplitude));
-      if (b) 
-        SetChargeType(kAmplitude);
+      if (b)
+          SetChargeType(kAmplitude);
       rc = kTRUE;
-    }
+  }
   if (IsEnvDefined(env, prefix, "Integral", print))
-    {
+  {
       b = GetEnvValue(env, prefix, "Integral", IsExtractionType(kIntegral));
-      if (b) 
-        SetChargeType(kIntegral);
+      if (b)
+          SetChargeType(kIntegral);
       rc = kTRUE;
-    }
+  }
+
+  if (IsEnvDefined(env, prefix, "ExtractionType", print))
+  {
+      TString type = GetEnvValue(env, prefix, "ExtractionType", "");
+      type.ToLower();
+      type = type.Strip(TString::kBoth);
+      if (type==(TString)"amplitude")
+          SetChargeType(kAmplitude);
+      if (type==(TString)"integral")
+          SetChargeType(kIntegral);
+      if (type==(TString)"maximum")
+          SetChargeType(kMaximum);
+      if (type==(TString)"halfmaximum")
+          SetChargeType(kHalfMaximum);
+      rc=kTRUE;
+  }
+
+
+
 
   return MExtractTimeAndCharge::ReadEnv(env, prefix, print) ? kTRUE : rc;