Changeset 12785 for trunk/FACT++/src

Timestamp:

01/30/12 16:59:42 (13 years ago)

Author:

tbretz

Message:

In addition to the information whether a drs file exist store also the progress (step) of teh drs calibration for convenience; fixed that trigger type==0 was counted as data-event which is wrong.

Location:

trunk/FACT++/src

Files:

• DataCalib.h (modified) (1 diff)
• DataWriteFits.cc (modified) (2 diffs)
• DataWriteFits.h (modified) (1 diff)

trunk/FACT++/src/DataCalib.h

@@ -25 +25 @@
     void WriteFits();
 
-    bool IsDrsCalib() const { return true; }
+    int GetDrsStep() const { return fData.fStep; }
 
 public:

trunk/FACT++/src/DataWriteFits.cc

@@ -172 +172 @@
         fFile.WriteKey("REFCLK", avg/cnt*2.048, "Average reference clock frequency in Hz");
 
-        fFile.WriteKey("DRSCALIB", IsDrsCalib(), "This file belongs to a DRS calibration");
+        fFile.WriteKey("DRSCALIB", GetDrsStep()>=0, "This file belongs to a DRS calibration");
+        if (GetDrsStep()>=0)
+            fFile.WriteKey("DRSSTEP", GetDrsStep(), "Step of the DRS calibration");
 
     }
@@ -201 +203 @@
         return false;
 
-    if (!(e->TriggerType & FAD::EventHeader::kAll))
+    if (e->TriggerType && !(e->TriggerType & FAD::EventHeader::kAll))
         fTriggerCounter[0]++;
     else  if ((e->TriggerType&FAD::EventHeader::kPedestal) && !(e->TriggerType&FAD::EventHeader::kTIM))

trunk/FACT++/src/DataWriteFits.h

@@ -25 +25 @@
     bool WriteFooter(RUN_TAIL *rt);
 
-    virtual bool IsDrsCalib() const { return false; }
+    virtual int GetDrsStep() const { return -1; }
 
 public: