Patch for dimuons (Laurent)

[u/mrichter/AliRoot.git] / ZDC / AliZDCv3.cxx

diff --git a/ZDC/AliZDCv3.cxx b/ZDC/AliZDCv3.cxx
index e7fa9ee06346c8a900c03f38bd289651f98fd00d..7c8be6543a589c12ebda37ed5a6e831faf46d7a6 100644 (file)
--- a/ZDC/AliZDCv3.cxx
+++ b/ZDC/AliZDCv3.cxx
@@ -2199,6 +2199,7 @@ void AliZDCv3::InitTables()
  //
 
   Int_t k, j;
+  int read=1;
 
   //  --- Reading light tables for ZN 
   char *lightfName1 = gSystem->ExpandPathName("$ALICE_ROOT/ZDC/light22620362207s");
@@ -2207,43 +2208,61 @@ void AliZDCv3::InitTables()
      printf("Cannot open file fp1 \n");
      return;
   }
+  else{
+    for(k=0; k<fNalfan; k++){
+      for(j=0; j<fNben; j++){
+       read = fscanf(fp1,"%f",&fTablen[0][k][j]);
+       if(read==0) AliDebug(3, " Error in reading light table 1");
+      }
+    }
+    fclose(fp1);
+  }
   char *lightfName2 = gSystem->ExpandPathName("$ALICE_ROOT/ZDC/light22620362208s");
   FILE *fp2 = fopen(lightfName2,"r");
   if(fp2 == NULL){
      printf("Cannot open file fp2 \n");
      return;
   }  
+  else{
+    for(k=0; k<fNalfan; k++){
+      for(j=0; j<fNben; j++){
+       read = fscanf(fp2,"%f",&fTablen[1][k][j]);
+       if(read==0) AliDebug(3, " Error in reading light table 2");
+      }
+    }
+    fclose(fp2);
+  }
   char *lightfName3 = gSystem->ExpandPathName("$ALICE_ROOT/ZDC/light22620362209s");
   FILE *fp3 = fopen(lightfName3,"r");
   if(fp3 == NULL){
      printf("Cannot open file fp3 \n");
      return;
   }
+  else{
+    for(k=0; k<fNalfan; k++){
+      for(j=0; j<fNben; j++){
+       read = fscanf(fp3,"%f",&fTablen[2][k][j]);
+       if(read==0) AliDebug(3, " Error in reading light table 3");
+      }
+    }
+    fclose(fp3);
+  }
   char *lightfName4 = gSystem->ExpandPathName("$ALICE_ROOT/ZDC/light22620362210s");
   FILE *fp4 = fopen(lightfName4,"r");
   if(fp4 == NULL){
      printf("Cannot open file fp4 \n");
      return;
   }
-  
-  int read=1;
-  for(k=0; k<fNalfan; k++){
-     for(j=0; j<fNben; j++){
-       read = fscanf(fp1,"%f",&fTablen[0][k][j]);
-       if(read==0) AliDebug(3, " Error in reading light table 1");
-       read = fscanf(fp2,"%f",&fTablen[1][k][j]);
-       if(read==0) AliDebug(3, " Error in reading light table 2");
-       read = fscanf(fp3,"%f",&fTablen[2][k][j]);
-       if(read==0) AliDebug(3, " Error in reading light table 3");
+  else{
+    for(k=0; k<fNalfan; k++){
+      for(j=0; j<fNben; j++){
        read = fscanf(fp4,"%f",&fTablen[3][k][j]);
        if(read==0) AliDebug(3, " Error in reading light table 4");
-     } 
+      }
+    }
+    fclose(fp4);
   }
-  fclose(fp1);
-  fclose(fp2);
-  fclose(fp3);
-  fclose(fp4);
-  
+    
   //  --- Reading light tables for ZP and ZEM
   char *lightfName5 = gSystem->ExpandPathName("$ALICE_ROOT/ZDC/light22620552207s");
   FILE *fp5 = fopen(lightfName5,"r");
@@ -2251,41 +2270,61 @@ void AliZDCv3::InitTables()
      printf("Cannot open file fp5 \n");
      return;
   }
+  else{
+    for(k=0; k<fNalfap; k++){
+      for(j=0; j<fNbep; j++){
+       read = fscanf(fp5,"%f",&fTablep[0][k][j]);
+       if(read==0) AliDebug(3, " Error in reading light table 5");
+      }
+    }
+    fclose(fp5);
+  }
   char *lightfName6 = gSystem->ExpandPathName("$ALICE_ROOT/ZDC/light22620552208s");
   FILE *fp6 = fopen(lightfName6,"r");
   if(fp6 == NULL){
      printf("Cannot open file fp6 \n");
      return;
   }
+  else{
+    for(k=0; k<fNalfap; k++){
+      for(j=0; j<fNbep; j++){
+       read = fscanf(fp6,"%f",&fTablep[1][k][j]);
+       if(read==0) AliDebug(3, " Error in reading light table 6");
+      }
+    }
+    fclose(fp6);
+  }
   char *lightfName7 = gSystem->ExpandPathName("$ALICE_ROOT/ZDC/light22620552209s");
   FILE *fp7 = fopen(lightfName7,"r");
   if(fp7 == NULL){
      printf("Cannot open file fp7 \n");
      return;
   }
+  else{
+    for(k=0; k<fNalfap; k++){
+      for(j=0; j<fNbep; j++){
+       read = fscanf(fp7,"%f",&fTablep[2][k][j]);
+       if(read==0) AliDebug(3, " Error in reading light table 7");
+      }
+    }
+   fclose(fp7);
+  }
   char *lightfName8 = gSystem->ExpandPathName("$ALICE_ROOT/ZDC/light22620552210s");
   FILE *fp8 = fopen(lightfName8,"r");
   if(fp8 == NULL){
      printf("Cannot open file fp8 \n");
      return;
   }
-  
-  for(k=0; k<fNalfap; k++){
-     for(j=0; j<fNbep; j++){
-       read = fscanf(fp5,"%f",&fTablep[0][k][j]);
-       if(read==0) AliDebug(3, " Error in reading light table 5");
-       read = fscanf(fp6,"%f",&fTablep[1][k][j]);
-       if(read==0) AliDebug(3, " Error in reading light table 6");
-       read = fscanf(fp7,"%f",&fTablep[2][k][j]);
-       if(read==0) AliDebug(3, " Error in reading light table 7");
+  else{
+    for(k=0; k<fNalfap; k++){
+      for(j=0; j<fNbep; j++){
        read = fscanf(fp8,"%f",&fTablep[3][k][j]);
        if(read==0) AliDebug(3, " Error in reading light table 8");
-     } 
+      }
+    }
+   fclose(fp8);
   }
-  fclose(fp5);
-  fclose(fp6);
-  fclose(fp7);
-  fclose(fp8);
+
 }
 //_____________________________________________________________________________
 void AliZDCv3::StepManager()