Changeset 14700 for trunk


Ignore:
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:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/FACT++/src/DataCalib.h

    r14025 r14700  
    2929
    3030public:
    31     DataCalib(const std::string &path, uint32_t id, DimDescribedService &dim, DimDescribedService &runs, MessageImp &imp) : DataWriteFits2(path, id, imp), fDim(dim), fDimRuns(runs)
     31    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)
    3232    {
    3333    }

  • trunk/FACT++/src/DataProcessorImp.cc

    r12477 r14700  
    22
    33#include "FAD.h"
     4#include "tools.h"
    45
    56#include "DimWriteStatistics.h" // weird dependency
    … …  
    1516//! @param extension a string containing the extension to be appened to the file name
    1617//
    17 string DataProcessorImp::FormFileName(const string &path, uint32_t runid, const string &extension)
     18string DataProcessorImp::FormFileName(const string &path, uint64_t night, uint32_t runid, const string &extension)
    1819{
    1920    ostringstream name;
    … …  
    2627    }
    2728
    28     const Time time;
    29 
    30     const Time night = time - boost::posix_time::hours(12);
    31 
    32     name << night.GetAsStr("%Y/%m/%d/");
     29    name << Tools::Form("%04d/%02d/%02d/", night/10000, (night/100)%100, night%100);
    3330
    3431    try
    … …  
    4239    }
    4340
    44     name << time.NightAsInt() << '_' << setfill('0') << setw(3) << runid << '.' << extension;
     41    name << night << '_' << setfill('0') << setw(3) << runid << '.' << extension;
    4542    return name.str();
    4643}

  • trunk/FACT++/src/DataProcessorImp.h

    r14168 r14700  
    2020{
    2121    std::string fPath;
     22    uint64_t    fNight;
    2223    uint32_t    fRunId;
    2324
    … …  
    3233
    3334public:
    34     DataProcessorImp(const std::string &path, uint32_t id, MessageImp &imp) : fPath(path), fRunId(id), fMsg(imp) { }
     35    DataProcessorImp(const std::string &path, uint64_t night, uint32_t id, MessageImp &imp) : fPath(path), fNight(night), fRunId(id), fMsg(imp) { }
    3536    virtual ~DataProcessorImp() { }
    3637
    … …  
    4445    uint32_t    GetRunId() const { return fRunId; }
    4546
    46     static std::string FormFileName(const std::string &path, uint32_t runid, const std::string &extension);
     47    static std::string FormFileName(const std::string &path, uint64_t night, uint32_t runid, const std::string &extension);
    4748    std::string FormFileName(const std::string &extension)
    4849    {
    49         return FormFileName(fPath, fRunId, extension);
     50        return FormFileName(fPath, fNight, fRunId, extension);
    5051    }
    5152};
    … …  
    5859
    5960public:
    60     DataDump(const std::string &path, uint32_t id, MessageImp &imp) : DataProcessorImp(path, id, imp) { }
     61    DataDump(const std::string &path, uint64_t night, uint32_t id, MessageImp &imp) : DataProcessorImp(path, night, id, imp) { }
    6162
    6263    bool Open(const RUN_HEAD* h, const FAD::RunDescription &d);
    … …  
    6869{
    6970public:
    70     DataDebug(const std::string &path, uint32_t id, MessageImp &imp) : DataDump(path, id, imp) { }
     71    DataDebug(const std::string &path, uint64_t night, uint32_t id, MessageImp &imp) : DataDump(path, night, id, imp) { }
    7172
    7273    bool WriteEvt(EVENT *e);

  • trunk/FACT++/src/DataWriteFits.h

    r12785 r14700  
    2828
    2929public:
    30     DataWriteFits(const std::string path, uint32_t runid, MessageImp &imp) :
    31         DataProcessorImp(path, runid, imp), fConv(0), fFile(imp)
     30    DataWriteFits(const std::string path, uint64_t night,  uint32_t runid, MessageImp &imp) :
     31        DataProcessorImp(path, night, runid, imp), fConv(0), fFile(imp)
    3232    {
    3333    }

  • trunk/FACT++/src/DataWriteFits2.h

    r14023 r14700  
    2222
    2323public:
    24     DataWriteFits2(const std::string path, uint32_t runid, MessageImp &imp) :
    25         DataProcessorImp(path, runid, imp)
     24    DataWriteFits2(const std::string path, uint64_t night, uint32_t runid, MessageImp &imp) :
     25        DataProcessorImp(path, night, runid, imp)
    2626    {
    2727    }

  • trunk/FACT++/src/DataWriteRaw.h

    r12477 r14700  
    6868
    6969public:
    70     DataWriteRaw(const std::string &path, uint32_t id, MessageImp &imp) : DataProcessorImp(path, id, imp), fPosTail(0) { }
     70    DataWriteRaw(const std::string &path, uint64_t night, uint32_t id, MessageImp &imp) : DataProcessorImp(path, night, id, imp), fPosTail(0) { }
    7171    ~DataWriteRaw() { if (fOut.is_open()) Close(); }
    7272
Note: See TracChangeset for help on using the changeset viewer.