Changeset 14700

Timestamp:

11/26/12 12:08:18 (12 years ago)

Author:

tbretz

Message:

Not only the run number needs to be propagated for consistency but also the night. Otherwise we might check the night, configure the FADs and when we start the run it has changed already. Since it is at day time this is not a likely scenario but should be avoided nevertheless.

Location:

trunk/FACT++/src

Files:

• DataCalib.h (modified) (1 diff)
• DataProcessorImp.cc (modified) (4 diffs)
• DataProcessorImp.h (modified) (5 diffs)
• DataWriteFits.h (modified) (1 diff)
• DataWriteFits2.h (modified) (1 diff)
• DataWriteRaw.h (modified) (1 diff)

trunk/FACT++/src/DataCalib.h

@@ -29 +29 @@
 
 public:
-    DataCalib(const std::string &path, uint32_t id, DimDescribedService &dim, DimDescribedService &runs, MessageImp &imp) : DataWriteFits2(path, id, imp), fDim(dim), fDimRuns(runs)
+    DataCalib(const std::string &path, uint64_t night, uint32_t id, DimDescribedService &dim, DimDescribedService &runs, MessageImp &imp) : DataWriteFits2(path, night, id, imp), fDim(dim), fDimRuns(runs)
     {
     }

trunk/FACT++/src/DataProcessorImp.cc

@@ -2 +2 @@
 
 #include "FAD.h"
+#include "tools.h"
 
 #include "DimWriteStatistics.h" // weird dependency
@@ -15 +16 @@
 //! @param extension a string containing the extension to be appened to the file name
 //
-string DataProcessorImp::FormFileName(const string &path, uint32_t runid, const string &extension)
+string DataProcessorImp::FormFileName(const string &path, uint64_t night, uint32_t runid, const string &extension)
 {
     ostringstream name;
@@ -26 +27 @@
     }
 
-    const Time time;
-
-    const Time night = time - boost::posix_time::hours(12);
-
-    name << night.GetAsStr("%Y/%m/%d/");
+    name << Tools::Form("%04d/%02d/%02d/", night/10000, (night/100)%100, night%100);
 
     try
@@ -42 +39 @@
     }
 
-    name << time.NightAsInt() << '_' << setfill('0') << setw(3) << runid << '.' << extension;
+    name << night << '_' << setfill('0') << setw(3) << runid << '.' << extension;
     return name.str();
 }

trunk/FACT++/src/DataProcessorImp.h

@@ -20 +20 @@
 {
     std::string fPath;
+    uint64_t    fNight;
     uint32_t    fRunId;
 
@@ -32 +33 @@
 
 public:
-    DataProcessorImp(const std::string &path, uint32_t id, MessageImp &imp) : fPath(path), fRunId(id), fMsg(imp) { }
+    DataProcessorImp(const std::string &path, uint64_t night, uint32_t id, MessageImp &imp) : fPath(path), fNight(night), fRunId(id), fMsg(imp) { }
     virtual ~DataProcessorImp() { }
 
@@ -44 +45 @@
     uint32_t    GetRunId() const { return fRunId; }
 
-    static std::string FormFileName(const std::string &path, uint32_t runid, const std::string &extension);
+    static std::string FormFileName(const std::string &path, uint64_t night, uint32_t runid, const std::string &extension);
     std::string FormFileName(const std::string &extension)
     {
-        return FormFileName(fPath, fRunId, extension);
+        return FormFileName(fPath, fNight, fRunId, extension);
     }
 };
@@ -58 +59 @@
 
 public:
-    DataDump(const std::string &path, uint32_t id, MessageImp &imp) : DataProcessorImp(path, id, imp) { }
+    DataDump(const std::string &path, uint64_t night, uint32_t id, MessageImp &imp) : DataProcessorImp(path, night, id, imp) { }
 
     bool Open(const RUN_HEAD* h, const FAD::RunDescription &d);
@@ -68 +69 @@
 {
 public:
-    DataDebug(const std::string &path, uint32_t id, MessageImp &imp) : DataDump(path, id, imp) { }
+    DataDebug(const std::string &path, uint64_t night, uint32_t id, MessageImp &imp) : DataDump(path, night, id, imp) { }
 
     bool WriteEvt(EVENT *e);

trunk/FACT++/src/DataWriteFits.h

@@ -28 +28 @@
 
 public:
-    DataWriteFits(const std::string path, uint32_t runid, MessageImp &imp) :
-        DataProcessorImp(path, runid, imp), fConv(0), fFile(imp)
+    DataWriteFits(const std::string path, uint64_t night,  uint32_t runid, MessageImp &imp) :
+        DataProcessorImp(path, night, runid, imp), fConv(0), fFile(imp)
     {
     }

trunk/FACT++/src/DataWriteFits2.h

@@ -22 +22 @@
 
 public:
-    DataWriteFits2(const std::string path, uint32_t runid, MessageImp &imp) :
-        DataProcessorImp(path, runid, imp)
+    DataWriteFits2(const std::string path, uint64_t night, uint32_t runid, MessageImp &imp) :
+        DataProcessorImp(path, night, runid, imp)
     {
     }

trunk/FACT++/src/DataWriteRaw.h

@@ -68 +68 @@
 
 public:
-    DataWriteRaw(const std::string &path, uint32_t id, MessageImp &imp) : DataProcessorImp(path, id, imp), fPosTail(0) { }
+    DataWriteRaw(const std::string &path, uint64_t night, uint32_t id, MessageImp &imp) : DataProcessorImp(path, night, id, imp), fPosTail(0) { }
     ~DataWriteRaw() { if (fOut.is_open()) Close(); }