Changeset 12475

Timestamp:

11/09/11 21:47:01 (13 years ago)

Author:

tbretz

Message:

Write ROI at the beginning of fStats so that we can skip it when writing the data correctly; added RunDescription to Open

Location:

trunk/FACT++/src

Files:

• DataCalib.cc (modified) (6 diffs)
• DataCalib.h (modified) (2 diffs)

trunk/FACT++/src/DataCalib.cc

@@ -58 +58 @@
 }
 
-bool DataCalib::Open(RUN_HEAD* h)
+bool DataCalib::Open(const RUN_HEAD* h, const FAD::RunDescription &d)
 {
     if (h->NPix != 1440)
@@ -141 +141 @@
     fData.fNumTm = hastm ? 160 : 0;
 
-    return DataWriteFits::Open(h);
+    return DataWriteFits::Open(h, d);
 }
 
@@ -259 +259 @@
         return;
 
-    if (!file.WriteData(buf.data(), (1440*1024*4 + 1440*roi*2 + ntm*roi*2 + 3)*sizeof(float)))
+    if (!file.WriteData(buf.data()+sizeof(float), (1440*1024*4 + 1440*roi*2 + ntm*roi*2 + 3)*sizeof(float)))
         return;
 
@@ -280 +280 @@
         // Scale ADC data from 12bit to 2000mV
         GetSampleStats(fStats.data()+4, 2000./4096);
-        reinterpret_cast<uint32_t*>(fStats.data())[0] = GetRunId();;
+        reinterpret_cast<uint32_t*>(fStats.data())[1] = GetRunId();;
     }
     if (fData.fStep==1)
@@ -298 +298 @@
         // Scale ADC data from 12bit to 2000mV
         GetSampleStats(fStats.data()+1024*1440*2+4, 2000./4096/fData.fNumOffset);//0.5);
-        reinterpret_cast<uint32_t*>(fStats.data())[1] = GetRunId();;
+        reinterpret_cast<uint32_t*>(fStats.data())[2] = GetRunId();;
     }
     if (fData.fStep==2)
@@ -307 +307 @@
         // Scale ADC data from 12bit to 2000mV
         GetSampleStats(fStats.data()+1024*1440*4+4, 2000./4096/fData.fNumOffset);//0.5);
-        reinterpret_cast<uint32_t*>(fStats.data())[2] = GetRunId();
-        reinterpret_cast<uint32_t*>(fStats.data())[3] = fNumSamples;
+        reinterpret_cast<uint32_t*>(fStats.data())[0] = fNumSamples;
+        reinterpret_cast<uint32_t*>(fStats.data())[3] = GetRunId();
     }
 

trunk/FACT++/src/DataCalib.h

@@ -21 +21 @@
     DimDescribedService &fDim; // DimService through which statistics updates are transmitted
 
+//    uint16_t fDAC[8];
+
     void WriteFits();
 
@@ -31 +33 @@
     static void Update(DimDescribedService &dim);
 
-    bool Open(RUN_HEAD* h);
+    bool Open(const RUN_HEAD* h, const FAD::RunDescription &d);
     bool WriteEvt(EVENT *e);
     bool Close(RUN_TAIL * = 0);