Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 6393)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 6394)
@@ -33,4 +33,7 @@
      - make check for even number of slices in the case of "fundamental"
        pedestal calc.
+ 
+   * mcalib/MCalibrationChargeCalc.cc
+     - take out some commented code
 
 
Index: /trunk/MagicSoft/Mars/macros/calibration.C
===================================================================
--- /trunk/MagicSoft/Mars/macros/calibration.C	(revision 6393)
+++ /trunk/MagicSoft/Mars/macros/calibration.C	(revision 6394)
@@ -88,4 +88,5 @@
 //static TString inpath  = "/home/rootdata/Calib/2004_12_18";
 static TString inpath  = "/home/rootdata/Calib/2004_09_21";
+//static TString inpath  = "/home/rootdata/Calib/1999_01_01";
 static TString badfile;
 //static TString badfile = "badpixels_only0_388_559.dat";
@@ -158,5 +159,5 @@
   cout << extractorflag << endl;
 
-  MExtractor *extractor = getExtractor(extflag==33 ? 32 : extflag);
+  MExtractor *extractor = getExtractor(extflag==35 ? 32 : extflag);
 
   if (!extractor)
@@ -291,5 +292,5 @@
   // If you want to see the data-check plots only, choose:
   calloop.SetDataCheckDisplay();
-  //calloop.SetNormalDisplay();
+  //  calloop.SetNormalDisplay();
   // 
   // For everything, you have ever dreamed of, choose:
@@ -365,5 +366,5 @@
   /********************************************************************/
 
-  if (extflag == 33)
+  if (extflag == 35)
     {
       delete extractor;
@@ -477,7 +478,10 @@
     gLog << "     33:          SetNameWeightsFile('msignal/calibration_weights_UV_logain.dat')" << endl;
     gLog << "     34:          SetNameWeightsFile('msignal/MC_weights.dat')" << endl;
+    gLog << "     35:          SetNameWeightsFile('msignal/cosmics_weights.dat') (for cosmics) and" << endl;
+    gLog << "                  SetNameWeightsFile('msignal/calibration_weights_UV.dat') (for cal.)" << endl;
     gLog << "      MExtractTimeAndChargeDigitalFilterPeakSearch" << endl;
-    gLog << "     35:          SetNameWeightsFile('msignal/calibration_weights_UV.dat')" << endl;
-    gLog << endl;
+    gLog << "     36:          SetNameWeightsFile('msignal/calibration_weights_UV.dat')" << endl;
+    gLog << endl;
+    
     gLog << "     --inpath=#          Find the data in inpath"                      << endl;
     gLog << "     --outpath=#         Write the output containers to outpath"       << endl;
Index: /trunk/MagicSoft/Mars/macros/getExtractor.C
===================================================================
--- /trunk/MagicSoft/Mars/macros/getExtractor.C	(revision 6393)
+++ /trunk/MagicSoft/Mars/macros/getExtractor.C	(revision 6394)
@@ -187,5 +187,5 @@
     case 34:
       extractor = new MExtractTimeAndChargeDigitalFilter();
-      extractor->SetRange(0,14,3,14);
+      extractor->SetRange(0,16,3,14);
       break;
     case 35:
@@ -296,5 +296,5 @@
       ((MExtractTimeAndChargeSpline*)extractor)->SetRiseTimeHiGain(1.0); 
       ((MExtractTimeAndChargeSpline*)extractor)->SetFallTimeHiGain(3.0);
-      extractor->SetName(Form("%s_Rise-and-Fall-Time_%2.1f_%2.1f",extractor->GetName(),0.5,2.5));
+      extractor->SetName(Form("%s_Rise-and-Fall-Time_%2.1f_%2.1f",extractor->GetName(),1.0,3.0));
       break;
     case 27: