Changeset 19850 for trunk/Mars

Timestamp:

11/01/19 14:51:25 (5 years ago)

Author:

tbretz

Message:

This is also used to catch some option from the runheaders before pre-processing. Therefore, this has to be handles properly.

File:

• trunk/Mars/mcorsika/MCorsikaRead.cc (modified) (5 diffs)

trunk/Mars/mcorsika/MCorsikaRead.cc

@@ -290 +290 @@
     fNumTotalEvents = 0;
 
-    MCorsikaRunHeader runheader;
+    bool allocated = false;
+    MCorsikaRunHeader *runheader = fRunHeader;
+    if (!runheader)
+    {
+        runheader = new MCorsikaRunHeader;
+        allocated = true;
+    }
 
     Bool_t rc = kTRUE;
-
     while (1)
     {
@@ -314 +319 @@
                {
                if (blockType == 1200)
-                  status = runheader.ReadEvt(fInFormat, blockLength / sizeof(Float_t));
+                  status = runheader->ReadEvt(fInFormat, blockLength / sizeof(Float_t));
 
                else if(blockType == 1201)
@@ -323 +328 @@
                   vector<Float_t> buffer(blockLength / sizeof(Float_t));
                   status = fInFormat->Read(buffer.data(), blockLength);
-                  status = runheader.ReadEventHeader(buffer.data());
+                  status = runheader->ReadEventHeader(buffer.data());
                   break;
                   }
@@ -335 +340 @@
             if (!fInFormat->SeekEvtEnd())
             {
-               *fLog << (fForceMode?warn:err) << "ERROR - RUNE section not found in file." << endl;
+                *fLog << (fForceMode?warn:err) << "ERROR - RUNE section not found in file." << endl;
+               if (allocated)
+                   delete runheader;
                if (!fForceMode)
                   return fForceMode ? kTRUE : kFALSE;
             }
 
-            if (!runheader.ReadEvtEnd(fInFormat, kTRUE))
+            if (!runheader->ReadEvtEnd(fInFormat, kTRUE))
             {
                *fLog << (fForceMode?warn:err) << "ERROR - Reading RUNE section failed." << endl;
+               if (allocated)
+                   delete runheader;
                if (!fForceMode)
                   return kFALSE;
             }
 
-            fNumTotalEvents += runheader.GetNumEvents()*runheader.GetNumReuse()*
+            fNumTotalEvents += runheader->GetNumEvents()*runheader->GetNumReuse()*
                 (fTelescopeIdx<0 && fNumTelescope==0 ? fNumTelescopes : 1);
             continue;
@@ -354 +363 @@
     }
 
+    if (allocated)
+        delete runheader;
     return rc;
 }