Changeset 14025 for trunk/FACT++/src

Timestamp:

06/01/12 16:25:45 (12 years ago)

Author:

tbretz

Message:

Started to prepare to move WriteFits as WriteFitsImp to DrsCalibration class

Location:

trunk/FACT++/src

Files:

• DataCalib.cc (modified) (3 diffs)
• DataCalib.h (modified) (1 diff)

trunk/FACT++/src/DataCalib.cc

@@ -211 +211 @@
 }
 
-void DataCalib::WriteFits(const string &filename)
-{
-    ofits file(filename.c_str());
-
+void DataCalib::WriteFitsImp(const string &filename, const vector<float> &vec) const
+{
     const uint16_t roi = fData.fRoi;
     const uint16_t ntm = fData.fNumTm;
+
+    const size_t n = 1440*1024*4 + 1440*roi*2 + ntm*roi*2 + 3;
+
+    if (vec.size()!=n+1)
+        throw runtime_error("Size of vector does not match region-of-interest");
+
+    ofits file(filename.c_str());
 
     file.AddColumnInt("RunNumberBaseline");
@@ -252 +257 @@
 
     file.WriteTableHeader("DrsCalibration");
-
-    const int n = (1440*1024*4 + 1440*roi*2 + ntm*roi*2 + 3)*sizeof(float);
-    file.WriteRow(fStats.data()+1, n);
+    file.WriteRow(vec.data()+1, n*sizeof(float));
 }
 
@@ -305 +308 @@
         try
         {
-            WriteFits(filename);
+            WriteFitsImp(filename, fStats);
 
             ostringstream str;

trunk/FACT++/src/DataCalib.h

@@ -24 +24 @@
 //    uint16_t fDAC[8];
 
-    void WriteFits(const std::string &filename);
+    void WriteFitsImp(const std::string &filename, const std::vector<float> &vec) const;
 
     int GetDrsStep() const { return fData.fStep; }