Changeset 16055 for trunk/FACT++/src/DataCalib.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/DataCalib.cc (modified) (6 diffs)

trunk/FACT++/src/DataCalib.cc

@@ -89 +89 @@
 }
 
-bool DataCalib::Open(const RUN_HEAD* h, const FAD::RunDescription &d)
-{
-    if (h->NPix != 1440)
+bool DataCalib::Open(const RUN_HEAD &h, const FAD::RunDescription &d)
+{
+    if (h.NPix != 1440)
     {
         Error("Number of pixels in header for run "+to_string(GetRunId())+" not 1440.");
@@ -109 +109 @@
     }
 
-    if (fData.fStep!=2 && h->Nroi != 1024)
+    if (fData.fStep!=2 && h.Nroi != 1024)
     {
         ostringstream msg;
-        msg << "Region of interest of run " << GetRunId() << " not 1024, but " << h->Nroi << " in step " << fData.fStep <<  " ... as it ought to be.";
+        msg << "Region of interest of run " << GetRunId() << " not 1024, but " << h.Nroi << " in step " << fData.fStep <<  " ... as it ought to be.";
         Error(msg);
         return false;
@@ -121 +121 @@
     // We don't check consistency over several boards because this is done
     // by the eventCheck routine already
-    for (int i=0; i<h->NBoard; i++)
-    {
-        const PEVNT_HEADER &hh = h->FADhead[i];
+    for (int i=0; i<h.NBoard; i++)
+    {
+        const PEVNT_HEADER &hh = h.FADhead[i];
 
         if (hh.start_package_flag==0)
@@ -164 +164 @@
     fProcessing = true;
 
-    const bool hastm = h->Nroi<=512 && h->NroiTM>=2*h->Nroi;
+    const bool hastm = h.Nroi<=512 && h.NroiTM>=2*h.Nroi;
 
     Reset();
-    InitSize(hastm ? 1600 : 1440, h->Nroi);
+    InitSize(hastm ? 1600 : 1440, h.Nroi);
 
     fData.fRoi   = fNumSamples;
@@ -175 +175 @@
 }
 
-bool DataCalib::WriteEvt(const EVENT *e)
+bool DataCalib::WriteEvt(const EVENT &e)
 {
     // FIXME: SET StartPix to 0 if StartPix is -1
@@ -181 +181 @@
     if (fData.fStep==0)
     {
-        AddRel(e->Adc_Data, e->StartPix);
+        AddRel(e.Adc_Data, e.StartPix);
     }
     if (fData.fStep==1)
     {
-        AddRel(e->Adc_Data, e->StartPix, fData.fOffset.data(), fData.fNumOffset);
+        AddRel(e.Adc_Data, e.StartPix, fData.fOffset.data(), fData.fNumOffset);
     }
     if (fData.fStep==2)
     {
-        AddAbs(e->Adc_Data, e->StartPix, fData.fOffset.data(), fData.fNumOffset);
+        AddAbs(e.Adc_Data, e.StartPix, fData.fOffset.data(), fData.fNumOffset);
     }