Corrected free(event)

diff --git a/ZDC/ZDCEMDda.cxx b/ZDC/ZDCEMDda.cxx
index 1fd52746a8022d677e58835dd047c473f53a098f..d1838809b2fcb7fc3b8d7bcd0a116b192dedbde0 100644 (file)
--- a/ZDC/ZDCEMDda.cxx
+++ b/ZDC/ZDCEMDda.cxx
@@ -170,6 +170,9 @@ int main(int argc, char **argv) {
   int nevents_physics=0;
   int nevents_total=0;
 
+  struct eventHeaderStruct *event;
+  eventTypeType eventT;
+
   /* read the data files */
   int n;
   for(n=1;n<argc;n++){
@@ -186,8 +189,6 @@ int main(int argc, char **argv) {
 
     /* read the file */
     for(;;){
-      struct eventHeaderStruct *event;
-      eventTypeType eventT;
 
       /* get next event */
       status=monitorGetEventDynamic((void **)&event);
@@ -385,20 +386,14 @@ int main(int argc, char **argv) {
           histoEMDRaw[j]->Fill(ZDCRawADC[j]);
           histoEMDCorr[j]->Fill(ZDCCorrADCSum[j]);
        }
-    }
+    }//(if PHYSICS_EVENT)
     
     nevents_total++;
 
-    /* free resources */
-    free(event);
-    
-    /* exit when last event received, no need to wait for TERM signal */
-    if (eventT==END_OF_RUN) {
-      printf("EOR event detected\n");
-      break;
-    }
-
    }
+
+   /* free resources */
+   free(event);
   }
     
   /* Analysis of the histograms */

diff --git a/ZDC/ZDCLASERda.cxx b/ZDC/ZDCLASERda.cxx
index f6819c4fe493c96c99b2918dae3720346ae8e41c..850e30cb2961869581c48582d69573d45a78f529 100644 (file)
--- a/ZDC/ZDCLASERda.cxx
+++ b/ZDC/ZDCLASERda.cxx
@@ -189,6 +189,9 @@ int main(int argc, char **argv) {
   int nevents_physics=0;
   int nevents_total=0;
 
+  struct eventHeaderStruct *event;
+  eventTypeType eventT;
+
   /* read the data files */
   int n;
   for(n=1;n<argc;n++) {
@@ -205,8 +208,6 @@ int main(int argc, char **argv) {
 
     /* read the file */
     for(;;) {
-      struct eventHeaderStruct *event;
-      eventTypeType eventT;
 
       /* get next event */
       status=monitorGetEventDynamic((void **)&event);
@@ -303,7 +304,7 @@ int main(int argc, char **argv) {
         fclose(mapFile4Shuttle);
       }// SOD event
 
-      if(eventT==PHYSICS_EVENT){
+      else if(eventT==PHYSICS_EVENT){
        // --- Reading data header
         reader->ReadHeader();
         const AliRawDataHeader* header = reader->GetDataHeader();
@@ -418,12 +419,20 @@ int main(int argc, char **argv) {
          delete rawStreamZDC;
 
       }//(if PHYSICS_EVENT) 
-      nevents_total++;
 
-      /* free resources */
-      free(event);
+      /* exit when last event received, no need to wait for TERM signal */
+      else if(eventT==END_OF_RUN) {
+        printf(" -> EOR event detected\n");
+        break;
+      }
+      
+      
+      nevents_total++;
     
     }
+         
+    /* free resources */
+    free(event);
   }  
   
   /* Analysis of the histograms */

diff --git a/ZDC/ZDCMAPPINGda.cxx b/ZDC/ZDCMAPPINGda.cxx
index e140bf66f98b6032f7d66c3cc58fae780cd0cbe8..19c661c9fb2cfccf2654dbad4b71e4714e79b04d 100644 (file)
--- a/ZDC/ZDCMAPPINGda.cxx
+++ b/ZDC/ZDCMAPPINGda.cxx
@@ -191,10 +191,11 @@ int main(int argc, char **argv) {
       }
       
       iev++; 
+
+      /* free resources */
+      free(event);
     }    
       
-    /* free resources */
-    //free(event);
   }
   
   /* store the result files on FES */

diff --git a/ZDC/ZDCPEDESTALda.cxx b/ZDC/ZDCPEDESTALda.cxx
index 0f66ddd5cef1f1373f7d97845d0001ed02095f61..de7c2fa2f9bd7ec857d4b1409b3b2b25752214e2 100644 (file)
--- a/ZDC/ZDCPEDESTALda.cxx
+++ b/ZDC/ZDCPEDESTALda.cxx
@@ -288,7 +288,7 @@ int main(int argc, char **argv) {
         fclose(mapFile4Shuttle);
       }// SOD event
       
-      if(eventT==PHYSICS_EVENT){
+      else if(eventT==PHYSICS_EVENT){
        // --- Reading data header
         reader->ReadHeader();
         const AliRawDataHeader* header = reader->GetDataHeader();
@@ -389,20 +389,26 @@ int main(int argc, char **argv) {
              hPedCorrlg[k]->Fill(RawADCootlg[k], RawADClg[k]);
            }
          }
-         }
-         //
-         nevents_physics++;
-         //
-        delete reader;
-         delete rawStreamZDC;
+        }
+        nevents_physics++;
+        //
+       delete reader;
+        delete rawStreamZDC;
 
       }//(if PHYSICS_EVENT) 
+      
+      /* exit when last event received, no need to wait for TERM signal */
+      else if(eventT==END_OF_RUN) {
+        printf(" -> EOR event detected\n");
+        break;
+      }
+      
       nevents_total++;
-
-      /* free resources */
-//      free(event);
     
     }
+         
+    /* free resources */
+    free(event);
   }  
   
   /* Analysis of the histograms */