Changeset 16055 for trunk/FACT++/src/DataWriteFits.cc

Timestamp:

05/22/13 22:40:10 (11 years ago)

Author:

tbretz

Message:

Replaced the pointer argument when opening a file or writing an event by a const-reference.

File:

• trunk/FACT++/src/DataWriteFits.cc (modified) (8 diffs)

trunk/FACT++/src/DataWriteFits.cc

@@ -32 +32 @@
 //! @param h a pointer to the RUN_HEAD structure that contains the informations relative to this run
 //
-bool DataWriteFits::Open(const RUN_HEAD* h, const FAD::RunDescription &d)
+bool DataWriteFits::Open(const RUN_HEAD &h, const FAD::RunDescription &d)
 {
     if (fConv)
@@ -40 +40 @@
     }
 
-    const int16_t realRoiTM = (h->NroiTM >= 2*h->Nroi && h->Nroi<=512) ? h->Nroi : 0;
+    const int16_t realRoiTM = (h.NroiTM >= 2*h.Nroi && h.Nroi<=512) ? h.Nroi : 0;
 
     fFile.AddColumn('I', "EventNum");
@@ -52 +52 @@
     fFile.AddColumn('S', "StartCellData",       NPIX);
     fFile.AddColumn('S', "StartCellTimeMarker", NTMARK);
-    fFile.AddColumn('S', "Data",                h->NPix*h->Nroi);       
-    fFile.AddColumn('S', "TimeMarker",          h->NTm*realRoiTM);
+    fFile.AddColumn('S', "Data",                h.NPix*h.Nroi); 
+    fFile.AddColumn('S', "TimeMarker",          h.NTm*realRoiTM);
 
     // Write length of physical pipeline (1024)
     fConv = new Converter(Converter::ToFormat(fFile.GetColumnTypes()));
 
-    const size_t sz = (h->NPix*h->Nroi + h->NTm*realRoiTM)*2;
+    const size_t sz = (h.NPix*h.Nroi + h.NTm*realRoiTM)*2;
     if (fConv->GetSize()-sz+4!=sizeof(EVENT))
     {
@@ -86 +86 @@
     try
     {
-        fFile.WriteKey("BLDVER",   h->Version,  "Builder version");
+        fFile.WriteKey("BLDVER",   h.Version,  "Builder version");
         fFile.WriteKey("RUNID",    GetRunId(),  "Run number");
-//        fFile.WriteKey("RUNTYPE",  h->RunType,  "Type of run");
-        fFile.WriteKey("NBOARD",   h->NBoard,   "Number of acquisition boards");
-        fFile.WriteKey("NPIX",     h->NPix,     "Number of pixels");
-        fFile.WriteKey("NTMARK",   h->NTm,      "Number of time marker channels");
+//        fFile.WriteKey("RUNTYPE",  h.RunType,  "Type of run");
+        fFile.WriteKey("NBOARD",   h.NBoard,   "Number of acquisition boards");
+        fFile.WriteKey("NPIX",     h.NPix,     "Number of pixels");
+        fFile.WriteKey("NTMARK",   h.NTm,      "Number of time marker channels");
         fFile.WriteKey("NCELLS",   1024,        "Maximum number of slices per pixels");
-        fFile.WriteKey("NROI",     h->Nroi,     "Number of slices per pixels");
+        fFile.WriteKey("NROI",     h.Nroi,     "Number of slices per pixels");
         fFile.WriteKey("NROITM",   realRoiTM,   "Number of slices per time-marker");
 
-        const uint16_t realOffset = (h->NroiTM > h->Nroi) ?  h->NroiTM - 2*h->Nroi : 0;
+        const uint16_t realOffset = (h.NroiTM > h.Nroi) ?  h.NroiTM - 2*h.Nroi : 0;
         fFile.WriteKey("TMSHIFT",  realOffset,  "Shift of the start of the time marker readout wrt to data");
 
@@ -119 +119 @@
         // DAC
 
-        for (int i=0; i<h->NBoard; i++)
+        for (int i=0; i<h.NBoard; i++)
         {
-            const PEVNT_HEADER &hh = h->FADhead[i];
+            const PEVNT_HEADER &hh = h.FADhead[i];
 
             // Header values whihc won't change during the run
@@ -133 +133 @@
 
         // FIXME: Calculate average ref clock frequency
-        for (int i=0; i<h->NBoard; i++)
+        for (int i=0; i<h.NBoard; i++)
         {
-            const PEVNT_HEADER &hh = h->FADhead[i];
+            const PEVNT_HEADER &hh = h.FADhead[i];
 
             if (hh.start_package_flag==0)
@@ -158 +158 @@
         double avg = 0;
         int    cnt = 0;
-        for (int i=0; i<h->NBoard; i++)
+        for (int i=0; i<h.NBoard; i++)
         {
-            const PEVNT_HEADER &hh = h->FADhead[i];
+            const PEVNT_HEADER &hh = h.FADhead[i];
 
             if (hh.start_package_flag==0)
@@ -198 +198 @@
 //! @param e the pointer to the EVENT
 //
-bool DataWriteFits::WriteEvt(const EVENT *e)
+bool DataWriteFits::WriteEvt(const EVENT &e)
 {
     if (!fFile.AddRow())
         return false;
 
-    if (e->TriggerType && !(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))
+    else  if ((e.TriggerType&FAD::EventHeader::kPedestal) && !(e.TriggerType&FAD::EventHeader::kTIM))
         fTriggerCounter[1]++;
-    else if (e->TriggerType & FAD::EventHeader::kLPext)
+    else if (e.TriggerType & FAD::EventHeader::kLPext)
         fTriggerCounter[2]++;
-    else if (e->TriggerType & (FAD::EventHeader::kTIM|FAD::EventHeader::kPedestal))
+    else if (e.TriggerType & (FAD::EventHeader::kTIM|FAD::EventHeader::kPedestal))
         fTriggerCounter[3]++;
-    else if (e->TriggerType & FAD::EventHeader::kLPint)
+    else if (e.TriggerType & FAD::EventHeader::kLPint)
         fTriggerCounter[4]++;
-    else if (e->TriggerType & FAD::EventHeader::kExt1)
+    else if (e.TriggerType & FAD::EventHeader::kExt1)
         fTriggerCounter[5]++;
-    else if (e->TriggerType & FAD::EventHeader::kExt2)
+    else if (e.TriggerType & FAD::EventHeader::kExt2)
         fTriggerCounter[6]++;
     else
         fTriggerCounter[7]++;
 
-    memcpy(fTstop, &e->PCTime, 2*sizeof(uint32_t));
+    memcpy(fTstop, &e.PCTime, 2*sizeof(uint32_t));
     if (fTstart[0]==0)
         memcpy(fTstart, fTstop, 2*sizeof(uint32_t));
 
-    const int realRoiTM = (e->RoiTM > e->Roi) ? e->Roi : 0;
-    const size_t sz = sizeof(EVENT) + sizeof(e->StartPix)*e->Roi+sizeof(e->StartTM)*realRoiTM; //ETIENNE from RoiTm to Roi
-
-    const vector<char> data = fConv->ToFits(reinterpret_cast<const char*>(e)+4, sz-4);
+    const int realRoiTM = (e.RoiTM > e.Roi) ? e.Roi : 0;
+    const size_t sz = sizeof(EVENT) + sizeof(e.StartPix)*e.Roi+sizeof(e.StartTM)*realRoiTM; //ETIENNE from RoiTm to Roi
+
+    const vector<char> data = fConv->ToFits(reinterpret_cast<const char*>(&e)+4, sz-4);
 
     return fFile.WriteData(data.data(), data.size());