Changeset 18248

Timestamp:

06/20/15 19:25:14 (9 years ago)

Author:

Daniela Dorner

Message:

use drs-time fits file instead of rawfile

File:

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

trunk/Mars/fact/analysis/callisto.C

@@ -107 +107 @@
     }
 
-    TString timfile = drs.GetFileName(0, MSequence::kFitsDat);
+    TString drstime = "/gpfs0/fact/processing/drs_time_calib/20111115.time.drs.fits";
     TString drs1024 = drs.GetFileName(0, MSequence::kFitsDrs);
     TString pedfile = seq.GetFileName(0, MSequence::kFitsPed);
@@ -115 +115 @@
     gLog << "DRS calib     300: " << drsfile << '\n';
     gLog << "DRS calib    1024: " << drs1024 << "\n\n";
+    gLog << "DRS calib    Time: " << drstime << "\n\n";
+
+    MDrsCalibrationTime drscalibtime;
+    if (!drscalibtime.ReadFits(drstime.Data()))
+        return 5;
 
     MDrsCalibration drscalib300;
     if (!drscalib300.ReadFits(drsfile.Data()))
-        return 5;
+        return 6;
 
     MDrsCalibration drscalib1024;
     if (!drscalib1024.ReadFits(drs1024.Data()))
-        return 6;
+        return 7;
 
     gLog << all;
-    gLog << "Time calibration : " << timfile << '\n';
     gLog << "Pedestal     file: " << pedfile << '\n';
     gLog << "Light Pulser file: " << calfile << '\n' << endl;
@@ -135 +139 @@
     {
         gLog << err << "ERROR - Sequence valid but without files." << endl;
-        return 7;
+        return 8;
     }
     iter.Print();
@@ -195 +199 @@
     // hrate.DefaultLabelY("ERROR");
 
-    MDrsCalibrationTime timecam;
+//    MDrsCalibrationTime timecam;
 
     gStyle->SetOptFit(kTRUE);
 
     // ======================================================
-
+/*
     gLog << endl;
     gLog.Separator("Processing DRS timing calibration run");
@@ -240 +244 @@
     if (!loop0.GetDisplay())
         return 9;
-
+*/
     /*
      MHDrsCalibrationT *t = (MHDrsCalibrationT*)plist4.FindObject("MHDrsCalibrationT");
@@ -258 +262 @@
     plist1.AddToList(&drscalib300);
     plist1.AddToList(&badpixels);
-    plist1.AddToList(&timecam);
+    plist1.AddToList(&drscalibtime);
 
     MEvtLoop loop1("DetermineCalConst");
@@ -363 +367 @@
         }
 
-        timecam.SetDelays(g);
+        drscalibtime.SetDelays(g);
     }
 
@@ -377 +381 @@
     plist3.AddToList(&drscalib300);
     plist3.AddToList(&badpixels);
-    plist3.AddToList(&timecam);
+    plist3.AddToList(&drscalibtime);
 
     MEvtLoop loop3("DetermineRndmPed");
@@ -451 +455 @@
     plist4.AddToList(&drscalib300);
     plist4.AddToList(&badpixels);
-    plist4.AddToList(&timecam);
+    plist4.AddToList(&drscalibtime);
 
     MEvtLoop loop4("DetermineExtractedPed");
@@ -519 +523 @@
     plist5.AddToList(&drscalib300);
     plist5.AddToList(&badpixels);
-    plist5.AddToList(&timecam);
+    plist5.AddToList(&drscalibtime);
 
     MEvtLoop loop5("CalibratingData");