Changeset 18156 for trunk/Mars

Timestamp:

02/19/15 10:38:52 (10 years ago)

Author:

tbretz

Message:

Added Reset to DrsCalibrateTime and removed the reading and writing of fits files. It is now in MDrsCalibrationTime. If needed, it must be made conistent, e.g. diffferent table name.

File:

• trunk/Mars/mcore/DrsCalib.h (modified) (6 diffs)

trunk/Mars/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;
             }
 
@@ -1198 +1207 @@
     }
 
+    /*
+    // See MDrsCalibrationTime
     std::string ReadFitsImp(const std::string &str)
     {
@@ -1275 +1286 @@
             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");
-        */
-
         std::vector<double> data(fNumSamples*fNumChannels*2);
 
@@ -1298 +1302 @@
 
         return std::string();
-    }
+    }*/
 };