Changeset 12343 for trunk/FACT++/src/DataCalib.h

Timestamp:

10/31/11 14:52:20 (13 years ago)

Author:

tbretz

Message:

Moved some common code between MARS and FACT++ to DrsCalib.h as new class DrsCalibration; renamed CalibData to DrsCalibrate.

File:

• trunk/FACT++/src/DataCalib.h (modified) (3 diffs)

trunk/FACT++/src/DataCalib.h

@@ -2 +2 @@
 #define FACT_DataCalib
 
-#include "DataProcessorImp.h"
-
-using namespace std;
+#include "DataWriteFits.h"
 #include "externals/DrsCalib.h"
 
 class DimDescribedService;
 
-class DataCalib : public DataProcessorImp, CalibData
+using namespace std;
+
+class DataCalib : public DataWriteFits, public DrsCalibrate
 {
-    static std::vector<int32_t> fOffset;  /// Storage for physical baseline
-    static std::vector<int64_t> fGain;    /// Storage for baseline corrected gain
-    static std::vector<int64_t> fTrgOff;  /// Storage for logical baseline
+    static DrsCalibration fData;
 
-    static uint64_t fNumOffset;           /// Scale for physcial baseline
-    static uint64_t fNumGain;             /// Scale for gain values
-    static uint64_t fNumTrgOff;           /// Scale for logical baseline
-
-    static std::vector<float>   fStats;   /// Storage for mean and rms values
+    static std::vector<float> fStats;     /// Storage for mean and rms values
 
     /// State of the DRS calibration: Positiove numbers mean that
     /// we are in a run, negative mean that it is closed
-    static int  fStep;
     static bool fProcessing;
 
@@ -31 +24 @@
 
 public:
-    DataCalib(const std::string &path, uint32_t id, DimDescribedService &dim, MessageImp &imp) : DataProcessorImp(path, id, imp), fDim(dim)
+    DataCalib(const std::string &path, uint32_t id, DimDescribedService &dim, MessageImp &imp) : DataWriteFits(path, id, imp), fDim(dim)
     {
     }
@@ -42 +35 @@
     bool Close(RUN_TAIL * = 0);
 
-    static void Apply(int16_t *val, const int16_t *start, uint32_t roi);
-    static void Apply(float *vec, int16_t *val, const int16_t *start, uint32_t roi);
+    //static void Apply(int16_t *val, const int16_t *start, uint32_t roi);
+    static void Apply(float *vec, int16_t *val, const int16_t *start, uint32_t roi)
+    {
+        fData.Apply(vec, val, start, roi);
+    }
 
     static bool ReadFits(const string &fname, MessageImp &msg);
 
-    static bool IsValid() { return fStep>2; }
+    static bool IsValid() { return fData.IsValid(); }
 };