Changeset 17893

Timestamp:

05/26/14 16:26:53 (11 years ago)

Author:

Daniela Dorner

Message:

new callisto not using the light pulser, using a new extractor and pixel saturation treatment, not using delays

File:

• trunk/Mars/fact/analysis/callisto.C (modified) (26 diffs)

trunk/Mars/fact/analysis/callisto.C

@@ -1 +1 @@
 #include "MLogManip.h"
 
-int callisto(const char *seqfile="seq/2012/01/23/20120123_023.seq", const char *outpath = "output")
+int callisto9(const char *seqfile="seq/2012/01/23/20120123_023.seq", const char *outpath = "output", bool use_delays=false)
 {
     // ======================================================
@@ -12 +12 @@
 
     // map file to use (get that from La Palma!)
-    const char *map = usemap ? "/home/fact/FACT++/FACTmap111030.txt" : NULL;
-/*
-    Bool_t maximum = kTRUE;
-
-    const char *lp_template    = maximum ?
-        "template-lp-extractor-maximum.root" :
-        "template-lp-extractor-leading-edge.root";
-
-    const char *pulse_template = "template-pulse.root";
-*/
+//    const char *map = usemap ? "/home/fact/FACT++/FACTmap111030.txt" : NULL;
+    const char *map = usemap ? "/scratch/fact/FACTmap111030.txt" : NULL;
+
     // ------------------------------------------------------
-
-    //bool use_delays=false;
-
-    int spike_removal=3;
-
-    // The gain as extracted from our dark count spectra
-    double gain = 258;
-
-    // ------------------------------------------------------
-
-    // Extraction range in slices. It will always(!) contain the full range
-    // of integration
-    const int first_slice =  25; //  10ns
-    const int last_slice  = 225; // 125ns
-
-    // Note that rise and fall time mean different things whether you use IntegralFixed or IntegraRel:
-    //
-    //  IntegralFixed:
-    //    * fRiseTime: Number of slices left  from arrival time
-    //    * fFallTime: Number of slices right from arrival time
-    //  IntegralRel:
-    //    * fRiseTime: Number of slices left  from maximum time
-    //    * fFallTime: Number of slices right from maximum time
-    //
-/*
-    const int rise_time_cal = maximum ?  40 :  10; // was 13;   5ns
-    const int fall_time_cal = maximum ? 120 : 160; // was 23;  80ns
-
-    const int rise_time_dat = maximum ?  10 :   2; // was 13; was 10;   1ns
-    const int fall_time_dat = maximum ?  40 :  48; // was 23; was 40;  24ns
-
-    // Extraction type: Extract integral and half leading edge
-
-    const int type = maximum ? (MExtralgoSpline::kAmplitudeRel) : (MExtralgoSpline::kIntegralFixed);
-    //const int type = MExtralgoSpline::kIntegralFixed;
-
-
-    const double heighttm   = 0.5; // IntegralAbs { 1.5pe * 9.6mV/pe } / IntegralRel { 0.5 }
-*/
-    Long_t max  =    0;  // All
-    Long_t max0 =  max;  // Time marker
-    //Long_t max1 =  max;  // Light pulser
-    //Long_t max2 = 3000;  // Calibration ratio
-    //Long_t max3 =  max;  // Pedestal Rndm
-    //Long_t max4 =  max;  // Pedestal Ext
-    Long_t max5 =  max;  // Data
-
-    // ======================================================
-
-    if (map && gSystem->AccessPathName(map, kFileExists))
-    {
-        gLog << err << "ERROR - Cannot access mapping file '" << map << "'" << endl;
-        return 1;
-    }
-
-    // The sequence file which defines the files for the analysis
-    MSequence seq(seqfile);
-    if (!seq.IsValid())
-    {
-        gLog << err << "ERROR - Sequence '" << seqfile << "' invalid!" << endl;
-        return 2;
-    }
-
-    // --------------------------------------------------------------------------------
-
-    gLog.Separator("Callisto");
-    gLog << all << "Calibrate data of sequence '" << seq.GetFileName() << "'" << endl;
-    gLog << endl;
-
-    // ------------------------------------------------------
-
-    ostringstream drsname;
-    drsname << gSystem->DirName(seqfile) << "/";
-    drsname << seq.GetNight().GetNightAsInt() << "_";
-    drsname << Form("%03d", seq.GetDrsSequence()) << ".drs.seq";
-
-    MSequence drs(drsname.str().c_str());
-    if (!drs.IsValid())
-    {
-        gLog << err << "ERROR - DRS sequence invalid!" << endl;
-        return 3;
-    }
-
-    gLog << all << "DRS sequence file: " << drsname.str() << '\n' << endl;
-
-    TString drsfile = seq.GetFileName(0, MSequence::kRawDrs);
-    if (drsfile.IsNull())
-    {
-        gLog << err << "No DRS file available in sequence." << endl;
-        return 4;
-    }
-
-    TString timfile = drs.GetFileName(0, MSequence::kFitsDat);
-    TString drs1024 = drs.GetFileName(0, MSequence::kFitsDrs);
-    TString calfile = seq.GetFileName(0, MSequence::kFitsCal);
-    //TString pedfile = seq.GetFileName(0, MSequence::kFitsPed);
-
-    gLog << all;
-    gLog << "DRS calib     300: " << drsfile << '\n';
-    gLog << "DRS calib    1024: " << drs1024 << "\n\n";
-
-    MDrsCalibration drscalib300;
-    if (!drscalib300.ReadFits(drsfile.Data()))
-        return 5;
-
-    MDrsCalibration drscalib1024;
-    if (!drscalib1024.ReadFits(drs1024.Data()))
-        return 6;
-
-    gLog << all;
-    gLog << "Time calibration : " << timfile << '\n';
-    gLog << "Light Pulser file: " << calfile << '\n' << endl;
-    //gLog << "Pedestal     file: " << pedfile << '\n';
-
-    // ------------------------------------------------------
-
-    MDirIter iter;
-    if (seq.GetRuns(iter, MSequence::kFitsDat)<=0)
-    {
-        gLog << err << "ERROR - Sequence valid but without files." << endl;
-        return 7;
-    }
-    iter.Print();
-
-    // ======================================================
-
-    MStatusArray arrt, arrp;
-
-    TFile ft(lp_template);
-    if (arrt.Read()<=0)
-    {
-        gLog << err << "ERROR - Reading LP template from " << lp_template << endl;
-        return 100;
-    }
-
-    MHCamera *lpref = (MHCamera*)arrt.FindObjectInCanvas("ExtCalSig;avg", "MHCamera", "Cam");
-    if (!lpref)
-    {
-        gLog << err << "ERROR - LP Template not found in " << lp_template << endl;
-        return 101;
-    }
-    lpref->SetDirectory(0);
-
-    MHCamera *gain = (MHCamera*)arrt.FindObjectInCanvas("gain", "MHCamera", "Gain");
-    if (!gain)
-    {
-        gLog << err << "ERROR - Gain not found in " << lp_template << endl;
-        return 101;
-    }
-    gain->SetDirectory(0);
-
-    TFile fp(pulse_template);
-    if (arrp.Read()<=0)
-    {
-        gLog << err << "ERROR - Reading Pulse template from " << pulse_template << endl;
-        return 102;
-    }
-
-    TH1F *hpulse = (TH1F*)arrp.FindObjectInCanvas("hPixelEdgeMean0_0", "TH1F", "cgpPixelPulses0");
-    if (!hpulse)
-    {
-        gLog << err << "ERROR - Pulse Template not found in " << pulse_template << endl;
-        return 103;
-    }
-    hpulse->SetDirectory(0);
-
-    // ======================================================
 
     MStatusDisplay *d = new MStatusDisplay;
@@ -201 +27 @@
     badpixels[1208].SetUnsuitable(MBadPixelsPix::kUnsuitable);
     badpixels[1399].SetUnsuitable(MBadPixelsPix::kUnsuitable);
-
     //  Twin pixel
     //     113
@@ -210 +35 @@
     //    1393
 
-    MDrsCalibrationTime timecam;
+    // ------------------------------------------------------
+
+    // ------------------------------------------------------
+
+    // Calib: 51 / 90 / 197 (20% TH)
+    // Data:  52 / 64 / 104 (20% TH)
+
+    // Extraction range in slices. It will always(!) contain the full range
+    // of integration
+    const int first_slice =  25; //  10ns
+    const int last_slice  = 225; // 125ns
+
+    const double heighttm   = 0.5; // IntegralAbs { 1.5pe * 9.6mV/pe } / IntegralRel { 0.5 }
+
+    Long_t max  =    0;  // All
+    Long_t max0 =  max;  // Time marker
+    Long_t max1 =  max;  // Light pulser
+    //Long_t max2 = 3000;  // Calibration ratio
+    Long_t max3 =  max;  // Pedestal Rndm
+    Long_t max4 =  max;  // Pedestal Ext
+    Long_t max5 =  max;  // Data
+
+    // ========================= Result ==================================
+
+    //double scale = 0.1;
+    double scale = 0.1024;
+
+    // ======================================================
+
+    if (map && gSystem->AccessPathName(map, kFileExists))
+    {
+        gLog << err << "ERROR - Cannot access mapping file '" << map << "'" << endl;
+        return 1;
+    }
+
+    // The sequence file which defines the files for the analysis
+    MSequence seq(seqfile);
+    if (!seq.IsValid())
+    {
+        gLog << err << "ERROR - Sequence '" << seqfile << "' invalid!" << endl;
+        return 2;
+    }
+
+    // --------------------------------------------------------------------------------
+
+    gLog.Separator("Callisto");
+    gLog << all << "Calibrate data of sequence '" << seq.GetFileName() << "'" << endl;
+    gLog << endl;
+
+    // ------------------------------------------------------
+
+    ostringstream drsname;
+    drsname << gSystem->DirName(seqfile) << "/";
+    drsname << seq.GetNight().GetNightAsInt() << "_";
+    drsname << Form("%03d", seq.GetDrsSequence()) << ".drs.seq";
+
+    MSequence drs(drsname.str().c_str());
+    if (!drs.IsValid())
+    {
+        gLog << err << "ERROR - DRS sequence invalid!" << endl;
+        return 3;
+    }
+
+    gLog << all << "DRS sequence file: " << drsname.str() << '\n' << endl;
+
+    TString drsfile = seq.GetFileName(0, MSequence::kRawDrs);
+    if (drsfile.IsNull())
+    {
+        gLog << err << "No DRS file available in sequence." << endl;
+        return 4;
+    }
+
+    TString timfile = drs.GetFileName(0, MSequence::kFitsDat);
+    TString drs1024 = drs.GetFileName(0, MSequence::kFitsDrs);
+    TString pedfile = seq.GetFileName(0, MSequence::kFitsPed);
+    TString calfile = seq.GetFileName(0, MSequence::kFitsCal);
+
+    gLog << all;
+    gLog << "DRS calib     300: " << drsfile << '\n';
+    gLog << "DRS calib    1024: " << drs1024 << "\n\n";
+
+    MDrsCalibration drscalib300;
+    if (!drscalib300.ReadFits(drsfile.Data()))
+        return 5;
+
+    MDrsCalibration drscalib1024;
+    if (!drscalib1024.ReadFits(drs1024.Data()))
+        return 6;
+
+    gLog << all;
+    gLog << "Time calibration : " << timfile << '\n';
+    gLog << "Pedestal     file: " << pedfile << '\n';
+    gLog << "Light Pulser file: " << calfile << '\n' << endl;
+
+    // ------------------------------------------------------
+
+    MDirIter iter;
+    if (seq.GetRuns(iter, MSequence::kFitsDat)<=0)
+    {
+        gLog << err << "ERROR - Sequence valid but without files." << endl;
+        return 7;
+    }
+    iter.Print();
+
+    // ======================================================
+
+/*
+    MStatusArray arrt, arrp;
+
+    TFile ft(lp_template);
+    if (arrt.Read()<=0)
+    {
+        gLog << err << "ERROR - Reading LP template from " << lp_template << endl;
+        return 100;
+    }
+
+    MHCamera *lpref = (MHCamera*)arrt.FindObjectInCanvas("ExtCalSig;avg", "MHCamera", "Cam");
+    if (!lpref)
+    {
+        gLog << err << "ERROR - LP Template not found in " << lp_template << endl;
+        return 101;
+    }
+    lpref->SetDirectory(0);
+
+    MHCamera *gain = (MHCamera*)arrt.FindObjectInCanvas("gain", "MHCamera", "Gain");
+    if (!gain)
+    {
+        gLog << err << "ERROR - Gain not found in " << lp_template << endl;
+        return 101;
+    }
+    gain->SetDirectory(0);
+
+    TFile fp(pulse_template);
+    if (arrp.Read()<=0)
+    {
+        gLog << err << "ERROR - Reading Pulse template from " << pulse_template << endl;
+        return 102;
+    }
+
+    TH1F *hpulse = (TH1F*)arrp.FindObjectInCanvas("hPixelEdgeMean0_0", "TH1F", "cgpPixelPulses0");
+    if (!hpulse)
+    {
+        gLog << err << "ERROR - Pulse Template not found in " << pulse_template << endl;
+        return 103;
+    }
+    hpulse->SetDirectory(0);
+*/
+    // ======================================================
 
     // Plot the trigger pattern rates vs. run-number
@@ -223 +195 @@
     // hrate.DefaultLabelY("ERROR");
 
-    Bool_t isinteg =
-        (type&MExtralgoSpline::kIntegral)    ||
-        (type&MExtralgoSpline::kFixedWidth)  ||
-        (type&MExtralgoSpline::kDynWidth)
-        ? kTRUE : kFALSE;
+    MDrsCalibrationTime timecam;
 
     gStyle->SetOptFit(kTRUE);
@@ -241 +209 @@
     plist0.AddToList(&tlist0);
     plist0.AddToList(&drscalib1024);
-    plist0.AddToList(&badpixels);
     plist0.AddToList(&timecam);
 
@@ -257 +224 @@
 
     MDrsCalibApply drsapply0;
-    drsapply0.SetRemoveSpikes(spike_removal);
+    //drsapply0.SetRemoveSpikes(4);
 
     MFillH fill0("MHDrsCalibrationTime");
@@ -281 +248 @@
 
     // ======================================================
-/*
+
     gLog << endl;
     gLog.Separator("Processing external light pulser run");
@@ -308 +275 @@
 
     MDrsCalibApply drsapply1;
-    drsapply1.SetRemoveSpikes(spike_removal);
+    //drsapply1.SetRemoveSpikes(4);
+
+    MFilterData filterdata1;
 
     // ---
 
-    MExtractTimeAndChargeSpline extractor1b("ExtractPulse");
+    MExtractFACT extractor1b("ExtractPulse");
     extractor1b.SetRange(first_slice, last_slice);
-    extractor1b.SetRiseTimeHiGain(rise_time_cal);
-    extractor1b.SetFallTimeHiGain(fall_time_cal);
-    extractor1b.SetHeightTm(heighttm);
-    extractor1b.SetChargeType(type);
-    extractor1b.SetSaturationLimit(600000);
     extractor1b.SetNoiseCalculation(kFALSE);
-
-    MExtractTimeAndChargeSpline extractor1c("ExtractAmplitude");
-    extractor1c.SetRange(first_slice, last_slice);
-    extractor1c.SetChargeType(MExtralgoSpline::kAmplitude);
-    extractor1c.SetSaturationLimit(600000);
-    extractor1c.SetNoiseCalculation(kFALSE);
-    extractor1c.SetNameSignalCam("Amplitude");
-    extractor1c.SetNameTimeCam("AmplitudePos");
-
-    // ---
-
-    MHCamEvent evt1a(5, "CalRatio", "Ratio per slice between integrated signal and amplitude;; r [1/n]");
-    evt1a.SetNameSub("Amplitude", kTRUE);
-    MFillH fill1a(&evt1a, "MExtractedSignalCam", "FillRatio");
-    fill1a.SetDrawOption("gaus");
-
-    MParameterD ratio1a;
-    ratio1a.SetVal(1./(fall_time_cal+rise_time_cal));
-    fill1a.SetWeight(&ratio1a);
 
     // ---
@@ -391 +336 @@
     tlist1.AddToList(&drsapply1);
     tlist1.AddToList(&cont1);
+    tlist1.AddToList(&filterdata1);
     tlist1.AddToList(&extractor1b);
-    if (isinteg)
-    {
-        tlist1.AddToList(&extractor1c);
-        tlist1.AddToList(&fill1a);
-    }
     tlist1.AddToList(&calctm1a);
     tlist1.AddToList(&treat1);
@@ -416 +357 @@
         timecam.SetDelays(*evt1h.GetHist());
 
-    // ========================= Result ==================================
-
-    Double_t avgS = evt1f.GetHist()->GetMean();
-    Double_t medS = evt1f.GetHist()->GetMedian();
-    Double_t rmsS = evt1f.GetHist()->GetRMS();
-    Double_t maxS = evt1f.GetHist()->GetMaximum();
-
-    MArrayF der1(hpulse->GetNbinsX());
-    MArrayF der2(hpulse->GetNbinsX());
-
-    MExtralgoSpline spline(hpulse->GetArray()+1, hpulse->GetNbinsX(),
-                           der1.GetArray(), der2.GetArray());
-    spline.SetRiseFallTime(rise_time_dat, fall_time_dat);
-    spline.SetExtractionType(type);
-    spline.SetHeightTm(heighttm);
-
-    spline.Extract(hpulse->GetMaximumBin()-1);
-
-    // The pulser signal is most probably around 400mV/9.5mV
-    // IntegraFixed 2/48 corresponds to roughly 215mV*50slices
-    Double_t scale = 1./spline.GetSignal();
-
-    MArrayD calib(1440);
-    for (int i=0; i<1440; i++)
-    {
-        Double_t g = gain->GetBinContent(i+1)>0.5 ? gain->GetBinContent(i+1) : 1;
-        if (evt1f.GetHist()->GetBinContent(i+1)>0 && !badpixels[i].IsUnsuitable())
-            calib[i] = lpref->GetBinContent(i+1) / evt1f.GetHist()->GetBinContent(i+1) / g;
-    }
-
-    gROOT->SetSelectedPad(0);
-    d->AddTab("PulseTemp");
-    gPad->SetGrid();
-    hpulse->SetNameTitle("Pulse", "Single p.e. pulse template");
-    hpulse->SetDirectory(0);
-    hpulse->SetLineColor(kBlack);
-    hpulse->DrawCopy();
-
-    TAxis *ax = hpulse->GetXaxis();
-
-    Double_t w = hpulse->GetBinWidth(1);
-    Double_t T = w*(spline.GetTime()+0.5)       +ax->GetXmin();
-    Double_t H = w*(hpulse->GetMaximumBin()+0.5)+ax->GetXmin();
-
-    TLine line;
-    line.SetLineColor(kRed);
-    line.DrawLine(T-rise_time_dat*w, spline.GetHeight(),
-                  T+fall_time_dat*w, spline.GetHeight());
-    line.DrawLine(T, spline.GetHeight()/4, T, 3*spline.GetHeight()/4);
-    line.DrawLine(T-rise_time_dat*w, 0,
-                  T-rise_time_dat*w, spline.GetHeight());
-    line.DrawLine(T+fall_time_dat*w, 0,
-                  T+fall_time_dat*w, spline.GetHeight());
-
-    TGraph gg;
-    for (int ix=1; ix<=hpulse->GetNbinsX(); ix++)
-        for (int i=0; i<10; i++)
-        {
-            Double_t x = hpulse->GetBinLowEdge(ix)+i*hpulse->GetBinWidth(ix)/10.;
-            gg.SetPoint(gg.GetN(), x+w/2, spline.EvalAt(ix-1+i/10.));
-        }
-
-    gg.SetLineColor(kBlue);
-    gg.SetMarkerColor(kBlue);
-    gg.SetMarkerStyle(kFullDotMedium);
-    gg.DrawClone("L");
-
-    gROOT->SetSelectedPad(0);
-    d->AddTab("CalConst");
-    MGeomCamFACT fact;
-    MHCamera hcalco(fact);
-    hcalco.SetName("CalConst");
-    hcalco.SetTitle(Form("Relative calibration constant [%.0f/pe]", 1./scale));
-    hcalco.SetCamContent(calib);
-    hcalco.SetAllUsed();
-    //hcalco.Scale(scale);
-    hcalco.DrawCopy();
-*/
-
-    TF1 f("f", "[0]*(1-1/(1+exp(x/[1])))*exp(-x/[2])", -15, 150);
-    f.SetParameter(0, gain*0.05143);
-    f.SetParameter(1, 1.075);
-    f.SetParameter(2, 19.3);
-    f.SetNpx(2*165); //2GHz
-
-    // Convert to graph
-    TGraph g(&f);
-
-    // Convert to float
-    MArrayF x(g.GetN());
-    MArrayF y(g.GetN());
-    for (int i=0; i<g.GetN(); i++)
-    {
-        x[i] = g.GetX()[i];
-        y[i] = g.GetY()[i];
-    }
-
-    MFilterData filter;
-    filter.Filter(1, g.GetN(), y.GetArray(), y.GetArray());
-
-    // Define spline
-    MArrayF der1(g.GetN());
-    MArrayF der2(g.GetN());
-
-    MExtralgoSpline spline(y.GetArray(), y.GetSize(),
-                           der1.GetArray(), der2.GetArray());
-
-    spline.SetExtractionType(MExtralgoSpline::kAmplitudeRel);
-    spline.SetHeightTm(0.5);
-
-    // Estimate where the maximum is and extract signal
-    Long64_t maxi = TMath::LocMax(y.GetSize(), y.GetArray());
-    spline.Extract(maxi);
-
-    // Scale factor for signal extraction
-    double scale = 1./spline.GetSignal();
-
     // ======================================================
-/*
+
     gLog << endl;
     gLog.Separator("Extracting random pedestal");
@@ -563 +387 @@
 
     MDrsCalibApply drsapply3;
-    drsapply3.SetRemoveSpikes(spike_removal);
+    //drsapply3.SetRemoveSpikes(4);
+
+    MFilterData filterdata3;
 
     //---
 
-    MExtractTimeAndChargeSpline extractor3;
+    MExtractFACT extractor3;
     extractor3.SetRange(first_slice, last_slice);
-    extractor3.SetRiseTimeHiGain(rise_time_dat);
-    extractor3.SetFallTimeHiGain(fall_time_dat);
-    extractor3.SetHeightTm(heighttm);
-    extractor3.SetChargeType(type);
-    extractor3.SetSaturationLimit(600000);
     extractor3.SetNoiseCalculation(kTRUE);
 
     MCalibrateFact conv3;
     conv3.SetScale(scale);
-    conv3.SetCalibConst(calib);
+    //conv3.SetCalibConst(calib);
 
     MBadPixelsTreat treat3;
@@ -597 +418 @@
     tlist3.AddToList(&drsapply3);
     tlist3.AddToList(&cont3);
+    tlist3.AddToList(&filterdata3);
     tlist3.AddToList(&extractor3);
 //    tlist3.AddToList(&fill3a);
@@ -637 +459 @@
 
     MDrsCalibApply drsapply4;
-    drsapply4.SetRemoveSpikes(spike_removal);
-
-    MExtractTimeAndChargeSpline extractor4;
+    //drsapply4.SetRemoveSpikes(4);
+
+    MFilterData filterdata4;
+
+    MExtractFACT extractor4;
     extractor4.SetRange(first_slice, last_slice);
-    extractor4.SetRiseTimeHiGain(rise_time_dat);
-    extractor4.SetFallTimeHiGain(fall_time_dat);
-    extractor4.SetHeightTm(heighttm);
-    extractor4.SetChargeType(type);
-    extractor4.SetSaturationLimit(600000);
     extractor4.SetNoiseCalculation(kFALSE);
 
     MCalibrateFact conv4;
     conv4.SetScale(scale);
-    conv4.SetCalibConst(calib);
+    //conv4.SetCalibConst(calib);
 
     MBadPixelsTreat treat4;
@@ -668 +487 @@
     tlist4.AddToList(&drsapply4);
     tlist4.AddToList(&cont4);
+    tlist4.AddToList(&filterdata4);
     tlist4.AddToList(&extractor4);
-//    tlist4.AddToList(&fill4a);
     tlist4.AddToList(&conv4);
     tlist4.AddToList(&treat4);
@@ -679 +498 @@
     if (!loop4.GetDisplay())
         return 16;
-*/
+
     // ===================================================================
 
@@ -708 +527 @@
 
     MDrsCalibApply drsapply5;
-    drsapply5.SetRemoveSpikes(spike_removal);
+    //drsapply5.SetRemoveSpikes(4);
+
+    MTreatSaturation treatsat5;
+
+    MFilterData filterdata5;
 
     MFDataPhrase filterdat("(MRawEvtHeader.GetTriggerID&0xff00)==0",     "SelectDat");
@@ -719 +542 @@
     // ---
 
-    MTreatSaturation treatsat5;
-    MFilterData filterdata5;
-
     MExtractFACT extractor5dat;
     extractor5dat.SetRange(first_slice, last_slice);
-/*
-    MExtractTimeAndChargeSpline extractor5cal;
+    extractor5dat.SetNoiseCalculation(kFALSE);
+
+    MExtractFACT extractor5cal;
     extractor5cal.SetRange(first_slice, last_slice);
-    extractor5cal.SetRiseTimeHiGain(rise_time_cal);
-    extractor5cal.SetFallTimeHiGain(fall_time_cal);
-    extractor5cal.SetHeightTm(heighttm);
-    extractor5cal.SetChargeType(type);
-    extractor5cal.SetSaturationLimit(600000);
     extractor5cal.SetNoiseCalculation(kFALSE);
 
-    MExtractTimeAndChargeSpline extractor5tm("ExtractTM");
+    MExtractFACT extractor5tm("ExtractTM");
     extractor5tm.SetRange(last_slice, 294);
-    extractor5tm.SetRiseTimeHiGain(1);
-    extractor5tm.SetFallTimeHiGain(1);
-    extractor5tm.SetHeightTm(0.5);
-    extractor5tm.SetChargeType(MExtralgoSpline::kAmplitudeRel);
-    extractor5tm.SetSaturationLimit(600000);
     extractor5tm.SetNoiseCalculation(kFALSE);
     extractor5tm.SetNameSignalCam("TimeMarkerAmplitude");
     extractor5tm.SetNameTimeCam("TimeMarkerTime");
-*/
+
     extractor5dat.SetFilter(&filterncl);
-    //extractor5cal.SetFilter(&filtercal);
+    extractor5cal.SetFilter(&filtercal);
     //extractor4tm.SetFilter(&filtercal);
 
@@ -752 +563 @@
     MCalibrateFact conv5;
     conv5.SetScale(scale);
-    conv5.SetCalibConst(calib);
+    //conv5.SetCalibConst(calib);
 
     MCalibrateDrsTimes calctm5;
     calctm5.SetNameUncalibrated("UncalibratedTimes");
-/*
+
     MCalibrateDrsTimes calctm5tm("CalibrateTimeMarker");
     calctm5tm.SetNameArrivalTime("TimeMarkerTime");
@@ -806 +617 @@
     //fill5w.SetDrawOption("gaus");
     //fill5x.SetDrawOption("gaus");
-*/
+
 
     MBadPixelsTreat treat5;
     treat5.SetProcessPedestalRun(kFALSE);
     treat5.SetProcessPedestalEvt(kFALSE);
-/*
+
     MHSectorVsTime hist5cal("CalVsTm");
     MHSectorVsTime hist5ped("PedVsTm");
@@ -829 +640 @@
     fill5cal.SetFilter(&filtercal);
     fill5ped.SetFilter(&filterped);
-*/
+
     MHCamEvent evt5b(0, "ExtSig",   "Extracted signal;;S [mV·sl]");
     MHCamEvent evt5c(0, "CalSig",   "Calibrated and interpolated signal;;S [~phe]");
@@ -860 +671 @@
     // The second rule is for the case reading raw-files!
     MWriteRootFile write5(2, fname, "RECREATE", "Calibrated Data");
-    write5.AddContainer("MRawRunHeader",       "RunHeaders");
-    write5.AddContainer("MGeomCam",            "RunHeaders");
-    write5.AddContainer("MMcCorsikaRunHeader", "RunHeaders", kFALSE);
-    write5.AddContainer("MCorsikaRunHeader",   "RunHeaders", kFALSE);
-    write5.AddContainer("MMcRunHeader",        "RunHeaders", kFALSE);
-
-    // Common events
-    write5.AddContainer("MCorsikaEvtHeader",   "Events", kFALSE);
-    write5.AddContainer("MMcEvt",              "Events", kFALSE);
-    write5.AddContainer("IncidentAngle",       "Events", kFALSE);
-    write5.AddContainer("MPointingPos",        "Events", kFALSE);
-    write5.AddContainer("MSignalCam",          "Events");
-    write5.AddContainer("MTime",               "Events", kFALSE);
-    write5.AddContainer("MRawEvtHeader",       "Events");
+    write5.AddContainer("MRawRunHeader", "RunHeaders");
+    write5.AddContainer("MGeomCam",      "RunHeaders");
+    write5.AddContainer("MSignalCam",    "Events");
+    write5.AddContainer("MTime",         "Events");
+    write5.AddContainer("MRawEvtHeader", "Events");
+    //write.AddContainer("MTriggerPattern", "Events");
 
     // ------------------ Setup histograms and fill tasks ----------------
@@ -879 +682 @@
     MContinue test;
     test.SetFilter(&filterncl);
-/*
+
     MTaskList tlist5tm;
     tlist5tm.AddToList(&extractor5tm);
@@ -894 +697 @@
     tlist5tm.AddToList(&fill5x);
     tlist5tm.SetFilter(&filtercal);
-*/
+
     MTaskList tlist5dat;
     tlist5dat.AddToList(&fill5b);
@@ -914 +717 @@
     tlist5.AddToList(&filterdata5);
     tlist5.AddToList(&extractor5dat);
-    //tlist5.AddToList(&extractor5cal);
+    tlist5.AddToList(&extractor5cal);
     tlist5.AddToList(&calctm5);
-    //tlist5.AddToList(&tlist5tm);
+    tlist5.AddToList(&tlist5tm);
     tlist5.AddToList(&conv5);
     tlist5.AddToList(&treat5);
-    //tlist5.AddToList(&fill5ped);
-    //tlist5.AddToList(&fill5cal);
+    tlist5.AddToList(&fill5ped);
+    tlist5.AddToList(&fill5cal);
     tlist5.AddToList(&tlist5dat);
     tlist5.AddToList(&write5);
 
-    if (!loop5.Eventloop(max4))
+    if (!loop5.Eventloop(max5))
         return 18;
 
@@ -945 +748 @@
     return 0;
 }
-
-int callisto(const ULong64_t seqnum, const char *outpath = "output")
-{
-    UInt_t night = seqnum/1000;
-    UInt_t num   = seqnum%1000;
-
-    TString file = Form("/scratch/fact/sequences/%04d/%02d/%02d/%06d_%03d.seq",
-                        night/10000, (night/100)%100, night%100, num);
-
-    return callisto(file.Data(), outpath);
-}