Changeset 18282 for branches/MarsGapdTimeJitter/mcore

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)
• mcore/DrsCalib.h (modified) (4 diffs)
• mcore/factfits.h (modified) (1 diff)

branches/MarsGapdTimeJitter/mcore/DrsCalib.h

@@ -964 +964 @@
 
         fStat.resize(samples*channels);
+    }
+
+    void Reset()
+    {
+        for (auto it=fStat.begin(); it!=fStat.end(); it++)
+        {
+            it->first = 0;
+            it->second = 0;
+        }
     }
 
@@ -1144 +1153 @@
                 const double valw = it->second;
 
-                it->first = sumv>0 ? n*(1-s*sumw/sumv) : 0;
+                it->first  = sumv>0 ? n*(1-s*sumw/sumv) : 0;
 
                 sumv += valv;
@@ -1163 +1172 @@
                 sumw += valw;
 
-                it->first = sumv>0 ? n*(s*sumw/sumv-1) : 0;
+                it->first  = sumv>0 ? n*(s*sumw/sumv-1) : 0;
             }
 
@@ -1197 +1206 @@
         return pos-Offset(ch, pos);
     }
+
+    /*
+    // See MDrsCalibrationTime
+    std::string ReadFitsImp(const std::string &str)
+    {
+        fits file(str);
+        if (!file)
+        {
+            std::ostringstream msg;
+            msg << "Could not open file '" << str << "': " << strerror(errno);
+            return msg.str();
+        }
+
+        if (file.GetStr("TELESCOP")!="FACT")
+        {
+            std::ostringstream msg;
+            msg << "Reading '" << str << "' failed: Not a valid FACT file (TELESCOP not FACT in header)";
+            return msg.str();
+        }
+
+        if (file.GetNumRows()!=1)
+        {
+            std::ostringstream msg;
+            msg << "Reading '" << str << "' failed: Number of rows in table is not 1.";
+            return msg.str();
+        }
+
+        fNumSamples  = file.GetUInt("NROI");
+        fNumChannels = file.GetUInt("NCH");
+        fNumEntries  = file.GetUInt("NBTIME");
+
+        fStat.resize(fNumSamples*fNumChannels);
+
+        double *f = reinterpret_cast<double*>(file.SetPtrAddress("CellWidthMean"));
+        double *s = reinterpret_cast<double*>(file.SetPtrAddress("CellWidthRms"));
+
+        if (!file.GetNextRow())
+        {
+            std::ostringstream msg;
+            msg << "Reading data from " << str << " failed.";
+            return msg.str();
+        }
+
+        for (uint32_t i=0; i<fNumSamples*fNumChannels; i++)
+        {
+            fStat[i].first  = f[i];
+            fStat[i].second = s[i];
+        }
+
+        return std::string();
+    }
+
+    std::string WriteFitsImp(const std::string &filename, uint32_t night=0) const
+    {
+        ofits file(filename.c_str());
+        if (!file)
+        {
+            std::ostringstream msg;
+            msg << "Could not open file '" << filename << "': " << strerror(errno);
+            return msg.str();
+        }
+
+        file.SetDefaultKeys();
+        file.AddColumnDouble(fStat.size(), "CellWidthMean", "ratio", "Relative cell width mean");
+        file.AddColumnDouble(fStat.size(), "CellWidthRms",  "ratio", "Relative cell width rms");
+
+        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");
+        if (night>0)
+            file.SetInt("NIGHT", night, "Night as int");
+
+        std::vector<double> data(fNumSamples*fNumChannels*2);
+
+        for (uint32_t i=0; i<fNumSamples*fNumChannels; i++)
+        {
+            data[i] = fStat[i].first;
+            data[fNumSamples*fNumChannels+i] = fStat[i].second;
+        }
+
+        if (!file.WriteRow(data.data(), data.size()*sizeof(double)))
+        {
+            std::ostringstream msg;
+            msg << "Writing data to " << filename << " failed.";
+            return msg.str();
+        }
+
+        return std::string();
+    }*/
 };
 

branches/MarsGapdTimeJitter/mcore/factfits.h

@@ -37 +37 @@
             readDrsCalib(fname);
     }
+
+        const std::vector<int16_t> &GetOffsetCalibration() const { return fOffsetCalibration; }
 
 private: