Index: trunk/MagicSoft/Mars/macros/getExtractor.C
===================================================================
--- trunk/MagicSoft/Mars/macros/getExtractor.C	(revision 5508)
+++ trunk/MagicSoft/Mars/macros/getExtractor.C	(revision 5511)
@@ -79,11 +79,9 @@
 //       28:          SetNameWeightsFile('msignal/cosmics_weights.dat')" << endl;
 //       29:          SetNameWeightsFile('msignal/cosmics_weights4.dat')" << endl;
-//       30:          SetNameWeightsFile('msignal/cosmics_weights_logain6.dat')" << endl;
-//       31:          SetNameWeightsFile('msignal/cosmics_weights_logain4.dat')" << endl;
+//       30:          SetNameWeightsFile('msignal/cosmics_weights_logain.dat')" << endl;
+//       31:          SetNameWeightsFile('msignal/cosmics_weights4_logain.dat')" << endl;
 //       32:          SetNameWeightsFile('msignal/calibration_weights_UV.dat')" << endl;
-//       33:          SetNameWeightsFile('msignal/calibration_weights_UV4.dat')" << endl;
-//       34:          SetNameWeightsFile('msignal/calibration_weights_UV_logain6.dat')" << endl;
-//       35:          SetNameWeightsFile('msignal/calibration_weights_UV_logain4.dat')" << endl;
-//       36:  Real Fit: (not yet implemented)" << endl;
+//       33:          SetNameWeightsFile('msignal/calibration_weights_UV_logain.dat')" << endl;
+//       34:  Real Fit: (not yet implemented)" << endl;
 // 
 // The extractor will also carry a meaningful name, storing all information about its 
@@ -189,8 +187,6 @@
     case 32:
     case 33:
-    case 34:
-    case 35:
       extractor = new MExtractTimeAndChargeDigitalFilter;
-      extractor->SetRange(0,14,2,14);
+      extractor->SetRange(0,18,2,14);
       useTimeAndCharge = kTRUE;
       break;
@@ -312,5 +308,5 @@
       break;
     case 31:
-      ((MExtractTimeAndChargeDigitalFilter*)extractor)->SetNameWeightsFile("msignal/cosmics_weights_logain4.dat");
+      ((MExtractTimeAndChargeDigitalFilter*)extractor)->SetNameWeightsFile("msignal/cosmics_weights4_logain.dat");
       break;
     case 32:
@@ -318,11 +314,5 @@
       break;
     case 33:
-      ((MExtractTimeAndChargeDigitalFilter*)extractor)->SetNameWeightsFile("msignal/calibration_weights4_UV.dat");
-      break;
-    case 34:
-      ((MExtractTimeAndChargeDigitalFilter*)extractor)->SetNameWeightsFile("msignal/calibration_weights_logain_UV.dat");
-      break;
-    case 35:
-      ((MExtractTimeAndChargeDigitalFilter*)extractor)->SetNameWeightsFile("msignal/calibration_weights_logain4_UV.dat");
+      ((MExtractTimeAndChargeDigitalFilter*)extractor)->SetNameWeightsFile("msignal/calibration_weights_UV_logain.dat");
       break;
     default: