Index: /trunk/Mars/fact/analysis/callisto.C
===================================================================
--- /trunk/Mars/fact/analysis/callisto.C	(revision 17875)
+++ /trunk/Mars/fact/analysis/callisto.C	(revision 17876)
@@ -306,31 +306,4 @@
     drsapply1.SetRemoveSpikes(spike_removal);
 
-    /*
-    MPedestalCam  fPedestalCamOut1a;
-    MPedestalCam  fPedestalCamOut1b;
-    MPedestalCam  fPedestalCamOut1c;
-
-    MPedCalcPedRun pedcalc1a;
-    MPedCalcPedRun pedcalc1b;
-    MPedCalcPedRun pedcalc1c;
-    pedcalc1a.SetPedestalsOut(&fPedestalCamOut1a);
-    pedcalc1b.SetPedestalsOut(&fPedestalCamOut1b);
-    pedcalc1c.SetPedestalsOut(&fPedestalCamOut1c);
-
-    MExtractTimeAndChargeSpline extractor1ab;
-    extractor1a.SetRange(first_slice, last_slice);
-    extractor1a.SetRiseTimeHiGain(rise_time);
-    extractor1a.SetFallTimeHiGain(fall_time);
-    extractor1a.SetChargeType(type);
-    extractor1a.SetSaturationLimit(600000);
-    extractor1a.SetNoiseCalculation(kFALSE);
-
-    pedcalc1a.SetRandomCalculation(kTRUE);
-    pedcalc1b.SetRandomCalculation(kFALSE);
-    pedcalc1a.SetExtractor(&extractor1a);
-    pedcalc1b.SetExtractor($extractor1a);
-    pedcalc1c.SetRangeFromExtractor(&extractor1a);
-    */
-
     // ---
 
@@ -560,20 +533,4 @@
     extractor3.SetNoiseCalculation(kTRUE);
 
-//    MHCamEvent evt2a(0, "PedRdm", "Extracted Pedestal Signal;;S");
-
-//    MFillH fill2a(&evt2a, "MExtractedSignalCam", "FillPedRndm");
-
-    // Use this for data, but not for calibration events
-//    evt2a.SetErrorSpread(kFALSE);
-
-    /*
-     MCalibrateData conv3;
-     conv3.SetCalibrationMode(MCalibrateData::kNone);
-     conv3.SetPedestalFlag(MCalibrateData::kNo);
-     conv3.SetCalibConvMinLimit(0);
-     conv3.SetCalibConvMaxLimit(10000);
-     conv3.SetScaleFactor(scale);
-     */
-
     MCalibrateFact conv3;
     conv3.SetScale(scale);
@@ -648,18 +605,4 @@
     extractor4.SetNoiseCalculation(kFALSE);
 
-    //    MHCamEvent evt3a(0, "PedExt", "Extracted Pedestal Signal;;S");
-
-    //    MFillH fill3a(&evt3a, "MExtractedSignalCam", "FillPedExt");
-
-    // Use this for data, but not for calibration events
-//    evt3a.SetErrorSpread(kFALSE);
-/*
-    MCalibrateData conv4;
-    conv4.SetCalibrationMode(MCalibrateData::kNone);
-    conv4.SetPedestalFlag(MCalibrateData::kNo);
-    conv4.SetCalibConvMinLimit(0);
-    conv4.SetCalibConvMaxLimit(10000);
-    conv4.SetScaleFactor(scale);
-*/
     MCalibrateFact conv4;
     conv4.SetScale(scale);
@@ -767,12 +710,4 @@
 
     // ---
-/*
-    MCalibrateData conv5;
-    conv5.SetCalibrationMode(MCalibrateData::kNone);
-    conv5.SetPedestalFlag(MCalibrateData::kNo);
-    conv5.SetCalibConvMinLimit(0);
-    conv5.SetCalibConvMaxLimit(10000);
-    conv5.SetScaleFactor(scale);
-*/
     MCalibrateFact conv5;
     conv5.SetScale(scale);