Changeset 17876 for trunk/Mars/fact


Ignore:
Timestamp:
05/21/14 17:01:18 (10 years ago)
Author:
tbretz
Message:
Removed some old commented code
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Mars/fact/analysis/callisto.C

    r17875 r17876  
    306306    drsapply1.SetRemoveSpikes(spike_removal);
    307307
    308     /*
    309     MPedestalCam  fPedestalCamOut1a;
    310     MPedestalCam  fPedestalCamOut1b;
    311     MPedestalCam  fPedestalCamOut1c;
    312 
    313     MPedCalcPedRun pedcalc1a;
    314     MPedCalcPedRun pedcalc1b;
    315     MPedCalcPedRun pedcalc1c;
    316     pedcalc1a.SetPedestalsOut(&fPedestalCamOut1a);
    317     pedcalc1b.SetPedestalsOut(&fPedestalCamOut1b);
    318     pedcalc1c.SetPedestalsOut(&fPedestalCamOut1c);
    319 
    320     MExtractTimeAndChargeSpline extractor1ab;
    321     extractor1a.SetRange(first_slice, last_slice);
    322     extractor1a.SetRiseTimeHiGain(rise_time);
    323     extractor1a.SetFallTimeHiGain(fall_time);
    324     extractor1a.SetChargeType(type);
    325     extractor1a.SetSaturationLimit(600000);
    326     extractor1a.SetNoiseCalculation(kFALSE);
    327 
    328     pedcalc1a.SetRandomCalculation(kTRUE);
    329     pedcalc1b.SetRandomCalculation(kFALSE);
    330     pedcalc1a.SetExtractor(&extractor1a);
    331     pedcalc1b.SetExtractor($extractor1a);
    332     pedcalc1c.SetRangeFromExtractor(&extractor1a);
    333     */
    334 
    335308    // ---
    336309
     
    560533    extractor3.SetNoiseCalculation(kTRUE);
    561534
    562 //    MHCamEvent evt2a(0, "PedRdm", "Extracted Pedestal Signal;;S");
    563 
    564 //    MFillH fill2a(&evt2a, "MExtractedSignalCam", "FillPedRndm");
    565 
    566     // Use this for data, but not for calibration events
    567 //    evt2a.SetErrorSpread(kFALSE);
    568 
    569     /*
    570      MCalibrateData conv3;
    571      conv3.SetCalibrationMode(MCalibrateData::kNone);
    572      conv3.SetPedestalFlag(MCalibrateData::kNo);
    573      conv3.SetCalibConvMinLimit(0);
    574      conv3.SetCalibConvMaxLimit(10000);
    575      conv3.SetScaleFactor(scale);
    576      */
    577 
    578535    MCalibrateFact conv3;
    579536    conv3.SetScale(scale);
     
    648605    extractor4.SetNoiseCalculation(kFALSE);
    649606
    650     //    MHCamEvent evt3a(0, "PedExt", "Extracted Pedestal Signal;;S");
    651 
    652     //    MFillH fill3a(&evt3a, "MExtractedSignalCam", "FillPedExt");
    653 
    654     // Use this for data, but not for calibration events
    655 //    evt3a.SetErrorSpread(kFALSE);
    656 /*
    657     MCalibrateData conv4;
    658     conv4.SetCalibrationMode(MCalibrateData::kNone);
    659     conv4.SetPedestalFlag(MCalibrateData::kNo);
    660     conv4.SetCalibConvMinLimit(0);
    661     conv4.SetCalibConvMaxLimit(10000);
    662     conv4.SetScaleFactor(scale);
    663 */
    664607    MCalibrateFact conv4;
    665608    conv4.SetScale(scale);
     
    767710
    768711    // ---
    769 /*
    770     MCalibrateData conv5;
    771     conv5.SetCalibrationMode(MCalibrateData::kNone);
    772     conv5.SetPedestalFlag(MCalibrateData::kNo);
    773     conv5.SetCalibConvMinLimit(0);
    774     conv5.SetCalibConvMaxLimit(10000);
    775     conv5.SetScaleFactor(scale);
    776 */
    777712    MCalibrateFact conv5;
    778713    conv5.SetScale(scale);
Note: See TracChangeset for help on using the changeset viewer.