Index: trunk/MagicSoft/Mars/macros/getExtractor.C
===================================================================
--- trunk/MagicSoft/Mars/macros/getExtractor.C	(revision 5579)
+++ trunk/MagicSoft/Mars/macros/getExtractor.C	(revision 5580)
@@ -62,17 +62,17 @@
 //       17:          SetWindowSize(2,2) << endl;
 //       18:          SetWindowSize(4,4) << endl;
-//       19:          SetWindowSize(6,6) << endl;
-//       20:          SetWindowSize(4,6) << endl;
+//       19:          SetWindowSize(4,6) << endl;
+//       20:          SetWindowSize(6,6) << endl;
 //       21:          SetWindowSize(8,8) << endl;
 //       22:          SetWindowSize(14,10) << endl;
 //        MExtractTimeAndChargeSpline:  << endl; 
-//                    SetChargeType(MExtractTimeAndChargeSpline::kIntegral) and: << endl;
+//       23:          SetChargeType(MExtractTimeAndChargeSpline::kAmplitude << endl;
+//                    SetRange(0,10,4,11) << endl; 
+//       24:          SetChargeType(MExtractTimeAndChargeSpline::kIntegral) and: << endl;
 //                    SetRange(0,18,2,14) and the following parameters: << endl; 
-//       23:          SetRiseTime(1.5); SetFallTime(4.5) << endl;
-//       24:          SetRiseTime(0.5); SetFallTime(2.5) << endl;
+//                    SetRiseTime(0.5); SetFallTime(0.5) << endl;
 //       25:          SetRiseTime(0.5); SetFallTime(1.5) << endl;
-//       26:          SetRiseTime(0.5); SetFallTime(0.5) << endl;
-//       27:          SetChargeType(MExtractTimeAndChargeSpline::kAmplitude << endl;
-//                    SetRange(0,10,4,11) << endl; 
+//       26:          SetRiseTime(0.5); SetFallTime(2.5) << endl;
+//       27:          SetRiseTime(1.5); SetFallTime(4.5) << endl;
 //        MExtractTimeAndChargeDigitalFilter << endl;
 //                    SetRange(0,18,2,14) and the following parameters: << endl; 
@@ -255,8 +255,8 @@
       break;
     case 19:
+      ((MExtractTimeAndChargeSlidingWindow*)extractor)->SetWindowSize(4,6);
+      break;
+    case 20:
       ((MExtractTimeAndChargeSlidingWindow*)extractor)->SetWindowSize(6,6);
-      break;
-    case 20:
-      ((MExtractTimeAndChargeSlidingWindow*)extractor)->SetWindowSize(4,6);
       break;
     case 21:
@@ -268,12 +268,12 @@
       // MExtractTimeAndChargeSpline
     case 23:
-      ((MExtractTimeAndChargeSpline*)extractor)->SetRiseTime(1.5); 
-      ((MExtractTimeAndChargeSpline*)extractor)->SetFallTime(4.5);
-      extractor->SetName(Form("%s_Rise-and-Fall-Time_%2.1f_%2.1f",extractor->GetName(),1.5,4.5));
+      ((MExtractTimeAndChargeSpline*)extractor)->SetChargeType(MExtractTimeAndChargeSpline::kAmplitude);
+      extractor->SetRange(0,10,4,11);
+      extractor->SetName(Form("%s_Amplitude",extractor->GetName()));
       break;
     case 24:
       ((MExtractTimeAndChargeSpline*)extractor)->SetRiseTime(0.5); 
-      ((MExtractTimeAndChargeSpline*)extractor)->SetFallTime(2.5);
-      extractor->SetName(Form("%s_Rise-and-Fall-Time_%2.1f_%2.1f",extractor->GetName(),0.5,2.5));
+      ((MExtractTimeAndChargeSpline*)extractor)->SetFallTime(0.5);
+      extractor->SetName(Form("%s_Rise-and-Fall-Time_%2.1f_%2.1f",extractor->GetName(),0.5,0.5));
       break;
     case 25:
@@ -284,10 +284,11 @@
     case 26:
       ((MExtractTimeAndChargeSpline*)extractor)->SetRiseTime(0.5); 
-      ((MExtractTimeAndChargeSpline*)extractor)->SetFallTime(0.5);
-      extractor->SetName(Form("%s_Rise-and-Fall-Time_%2.1f_%2.1f",extractor->GetName(),0.5,0.5));
+      ((MExtractTimeAndChargeSpline*)extractor)->SetFallTime(2.5);
+      extractor->SetName(Form("%s_Rise-and-Fall-Time_%2.1f_%2.1f",extractor->GetName(),0.5,2.5));
       break;
     case 27:
-      ((MExtractTimeAndChargeSpline*)extractor)->SetChargeType(MExtractTimeAndChargeSpline::kAmplitude);
-      extractor->SetRange(0,10,4,11);
+      ((MExtractTimeAndChargeSpline*)extractor)->SetRiseTime(1.5); 
+      ((MExtractTimeAndChargeSpline*)extractor)->SetFallTime(4.5);
+      extractor->SetName(Form("%s_Rise-and-Fall-Time_%2.1f_%2.1f",extractor->GetName(),1.5,4.5));
       break;
       // MExtractTimeAndChargeDigitalFilter
@@ -356,7 +357,5 @@
     case 25:
     case 26:
-      break;
     case 27:
-      extractor->SetName(Form("%s_Amplitude",extractor->GetName()));
       break;
     case 28: