Changeset 18282 for branches/MarsGapdTimeJitter/mdrs

Timestamp:

08/18/15 10:28:44 (9 years ago)

Author:

Jens Buss

Message:

merged Trunk into Branch

Location:

branches/MarsGapdTimeJitter

Files:

• . (modified) (1 prop)
• mdrs/MCalibrateDrsTimes.cc (modified) (3 diffs)
• mdrs/MDrsCalibration.h (modified) (1 diff)
• mdrs/MDrsCalibrationTime.cc (modified) (3 diffs)
• mdrs/MDrsCalibrationTime.h (modified) (3 diffs)
• mdrs/MHDrsCalibrationTime.cc (modified) (2 diffs)
• mdrs/MHDrsCalibrationTime.h (modified) (2 diffs)

branches/MarsGapdTimeJitter/mdrs/MCalibrateDrsTimes.cc

@@ -152 +152 @@
             continue;
 
-        const Float_t signal = (*fSignals)[sw].GetArrivalTime();
+        const Float_t signal = (*fSignals)[sw].GetArrivalTimeHiGain();
+        const Float_t slope  = (*fSignals)[sw].GetArrivalTimeHiGainError();
         const Float_t offset = fCalib ? fCalib->GetOffset(hw, start[hw], signal) : 0;
-        const Float_t delay  = fCalib ? fCalib->GetDelay(sw) : 0;
+        const Float_t offset2 = (fCalib && (signal-slope)>=0) ? fCalib->GetOffset(hw, start[hw], signal-slope) : 0;
+        const Float_t delay  = fCalib ? fCalib->GetDelay(hw) : 0;
 
         //if (fIsTimeMarker)
@@ -160 +162 @@
 
         // convert from slices to ns
-        const Float_t utime = 1000*(signal       )/fFreq-delay; // [ns]
-        const Float_t time  = 1000*(signal-offset)/fFreq-delay; // [ns]
+        const Float_t utime      = 1000*(signal       )/fFreq-delay;  // [ns]
+        const Float_t time       = 1000*(signal-offset)/fFreq-delay;  // [ns]
+        const Float_t slopecal   = (slope-offset+offset2)<0 ? -1 : 1000*(slope-offset+offset2)/fFreq; // [ns]
+        const Float_t uslope     = slope<0 ? -1 : 1000*(slope)/fFreq;                // [ns]
 
         /*
@@ -172 +176 @@
         {
             (*fArrivalTime)[idx[j]].SetArrivalTime(time);
+            (*fArrivalTime)[idx[j]].SetTimeSlope(slopecal);
             if (fArrivalTimeU)
+            {
                 (*fArrivalTimeU)[idx[j]].SetArrivalTime(utime);
+                (*fArrivalTimeU)[idx[j]].SetTimeSlope(uslope);
+            }
         }
     }

branches/MarsGapdTimeJitter/mdrs/MDrsCalibration.h

@@ -30 +30 @@
     }
 
-    bool ReadFits(TString str)
+    bool ReadFits(TString fname)
     {
-        gSystem->ExpandPathName(str);
+        gSystem->ExpandPathName(fname);
 
-        const std::string msg = ReadFitsImp(str.Data());
+        std::string msg;
+        try
+        {
+            msg = ReadFitsImp(fname.Data());
+        }
+        catch (const std::exception &e)
+        {
+            msg = e.what();
+        }
+
         if (msg.empty())
+        {
+            *fLog << inf << "Read DRS calibration file " << fname << std::endl;
             return true;
+        }
 
-        *fLog << err << msg << std::endl;
+        *fLog << err << "Error reading from " << fname << ": " << msg << std::endl;
         return false;
     }

branches/MarsGapdTimeJitter/mdrs/MDrsCalibrationTime.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  2013 <mailto:thomas.bretz@epfl.ch>
+!   Author(s): Thomas Bretz  2013 <mailto:tbretz@physik.rwth-aachen.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2013
+!   Copyright: MAGIC Software Development, 2000-2015
 !
 !
@@ -31 +31 @@
 
 #include <TH1.h>
+#include <TGraph.h>
 
 ClassImp(MDrsCalibrationTime);
@@ -48 +49 @@
     return true;
 }
+
+void MDrsCalibrationTime::SetDelays(const TGraph &g)
+{
+    fDelays.assign(g.GetY(), g.GetY()+g.GetN());
+}
+
+bool MDrsCalibrationTime::ReadFits(TString fname)
+{
+    gSystem->ExpandPathName(fname);
+
+    try
+    {
+        fits file(fname.Data());
+        if (!file)
+            throw runtime_error(strerror(errno));
+
+        if (file.GetStr("TELESCOP")!="FACT")
+        {
+            std::ostringstream msg;
+            msg << "Not a valid FACT file (TELESCOP not FACT in header)";
+            throw runtime_error(msg.str());
+        }
+
+        if (file.GetNumRows()!=1)
+            throw runtime_error("Number of rows in table is not 1.");
+
+        fNumSamples  = file.GetUInt("NROI");
+        fNumChannels = file.GetUInt("NCH");
+        fNumEntries  = file.GetUInt("NBTIME");
+
+        const double *d = reinterpret_cast<double*>(file.SetPtrAddress("CellOffset"));
+        if (!file.GetNextRow())
+            throw runtime_error("Read error.");
+
+        fOffsets.assign(d, d+fNumSamples*fNumChannels),
+        fDelays.resize(0);
+    }
+    catch (const exception &e)
+    {
+        *fLog << err << "Error reading from " << fname << ": " << e.what() << endl;
+        return false;
+    }
+
+    *fLog << inf << "Read DRS calibration file " << fname << endl;
+    return true;
+}
+
+bool MDrsCalibrationTime::WriteFits(const string &fname) const
+{
+    const Bool_t exists = !gSystem->AccessPathName(fname.c_str(), kFileExists);
+    if (exists)
+    {
+        *fLog << err << "File '" << fname << "' already exists." << endl;
+        return false;
+    }
+
+    try
+    {
+        ofits file(fname.c_str());
+        if (!file)
+            throw runtime_error(strerror(errno));
+
+        file.SetDefaultKeys();
+        file.AddColumnDouble(fNumSamples*fNumChannels, "CellOffset", "samples", "Integral cell offset");
+
+        file.SetInt("ADCRANGE", 2000,    "Dynamic range of the ADC in mV");
+        file.SetInt("DACRANGE", 2500,    "Dynamic range of the DAC in mV");
+        file.SetInt("ADC",      12,      "Resolution of ADC in bits");
+        file.SetInt("DAC",      16,      "Resolution of DAC in bits");
+        file.SetInt("NPIX",     1440,    "Number of channels in the camera");
+        file.SetInt("NTM",      0,       "Number of time marker channels");
+        file.SetInt("NROI",     fNumSamples,  "Region of interest");
+        file.SetInt("NCH",      fNumChannels, "Number of chips");
+        file.SetInt("NBTIME",   fNumEntries,  "Num of entries for time calibration");
+
+        file.WriteTableHeader("DrsCellTimes");
+        //file.SetInt("NIGHT", night, "Night as int");
+
+        /*
+        file.SetStr("DATE-OBS", fDateObs, "First event of whole DRS calibration");
+        file.SetStr("DATE-END", fDateEnd, "Last event of whole DRS calibration");
+        file.SetStr("RUN-BEG", fDateRunBeg[0], "First event of run 0");
+        file.SetStr("RUN-END", fDateRunEnd[0], "Last event of run 0");
+        */
+
+        if (!file.WriteRow(fOffsets.data(), fOffsets.size()*sizeof(double)))
+            throw runtime_error("Write error.");
+    }
+    catch (const exception &e)
+    {
+        *fLog << err << "Error writing to " << fname << ": " << e.what() << endl;
+        return false;
+    }
+
+    *fLog << inf << "Wrote DRS calibration file " << fname << endl;
+    return true;
+}

branches/MarsGapdTimeJitter/mdrs/MDrsCalibrationTime.h

@@ -10 +10 @@
 
 class TH1;
+class TGraph;
 
-class MDrsCalibrationTime : public MParContainer, public DrsCalibrateTime
+class MDrsCalibrationTime : public MParContainer//, public DrsCalibrateTime
 {
+    int64_t fNumEntries;
+
+    size_t fNumSamples;
+    size_t fNumChannels;
+
+    std::vector<double> fOffsets;
     std::vector<double> fDelays;
 
@@ -18 +25 @@
     MDrsCalibrationTime(const char *name=0, const char *title=0)
     {
-        fName  = name ? name : "MDrsCalibrationTime";
+        fName  = name  ? name  : "MDrsCalibrationTime";
         fTitle = title ? title : "";
     }
@@ -24 +31 @@
     void InitSize(uint16_t channels, uint16_t samples)
     {
-        //fDelays.clear();
-        //fDelays.resize(channels);
-
-        DrsCalibrateTime::InitSize(channels, samples);
+        fNumSamples  = samples;
+        fNumChannels = channels;
     }
 
     void SetCalibration(const DrsCalibrateTime &cal)
     {
-        *static_cast<DrsCalibrateTime*>(this) = cal;
+        fNumEntries  = cal.fNumEntries,
+        fNumSamples  = cal.fNumSamples,
+        fNumChannels = cal.fNumChannels,
+
+        fOffsets.resize(fNumSamples*fNumChannels);
+
+        for (size_t c=0; c<fNumChannels; c++)
+            for (size_t s=0; s<fNumSamples; s++)
+                fOffsets[c*fNumSamples+s] = cal.Offset(c, s);
     }
 
     bool SetDelays(const TH1 &cam);
+    void SetDelays(const TGraph &g);
 
-    double GetOffset(int hw, int spos, float tm) const
+    double GetOffset(uint32_t hw, uint32_t spos, float tm) const
     {
-        return Offset(hw/9, fmod(tm+spos, 1024)) - Offset(hw/9, spos);
+        const uint32_t ch = (hw/9)*fNumSamples;
+        return fOffsets[ch + fmod(tm+spos, fNumSamples)] - fOffsets[ch + spos];
     }
 
-    double GetDelay(int sw) const
+    double GetDelay(int hw) const
     {
-        return fDelays.size()==0 ? 0 : fDelays[sw];
+        return fDelays.size()==0 ? 0 : fDelays[hw];
     }
 
-    ClassDef(MDrsCalibrationTime, 2) // A list of histograms storing the Fadc spektrum of one pixel
+    bool ReadFits(TString fname);
+    bool WriteFits(const std::string &fname) const;
+
+    ClassDef(MDrsCalibrationTime, 3) // A list of histograms storing the Fadc spektrum of one pixel
 };
 

branches/MarsGapdTimeJitter/mdrs/MHDrsCalibrationTime.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz 2013 <mailto:tbretz@phys.ethz.ch>
-!
-!   Copyright: MAGIC Software Development, 2000-2014
+!   Author(s): Thomas Bretz 2013 <mailto:tbretz@physik.rwth-aachen.de>
+!
+!   Copyright: MAGIC Software Development, 2000-2015
 !
 !
@@ -37 +37 @@
 #include "MStatusDisplay.h"
 
+#include "MDrsCalibrationTime.h"
 #include "MPedestalSubtractedEvt.h"
 

branches/MarsGapdTimeJitter/mdrs/MHDrsCalibrationTime.h

@@ -2 +2 @@
 #define MARS_MHDrsCalibrationTime
 
-#ifndef MARS_DrsCalibrationTime
-#include "MDrsCalibrationTime.h"
+#ifndef MARS_DrsCalib
+#include "DrsCalib.h"
 #endif
 
@@ -23 +23 @@
     MDrsCalibrationTime    *fCal;     //!
 
-    MDrsCalibrationTime fData; //
+    DrsCalibrateTime fData; //
 
     void InitHistogram();