Bug corrected

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

diff --git a/ZDC/AliZDCv2.cxx b/ZDC/AliZDCv2.cxx
index ab2489929a2818f019813984a6b5511bd9176344..bed69a86a790ad4627f26d8f78394985c0173799 100644 (file)
--- a/ZDC/AliZDCv2.cxx
+++ b/ZDC/AliZDCv2.cxx
@@ -15,6 +15,15 @@
 
 /*
 $Log$
+Revision 1.3  2001/06/13 11:11:02  coppedis
+Minor changes
+
+Revision 1.2  2001/06/12 13:45:11  coppedis
+TDI in correct position and minor correction
+
+Revision 1.1  2001/05/14 09:57:39  coppedis
+A different geometry for the ZDCs
+
 
 */
 
@@ -320,11 +329,16 @@ void AliZDCv2::CreateBeamLine()
   gMC->Gsvolu("QTD2", "BOX ", idtmed[6], boxpar, 3);
   gMC->Gspos("QTD2", 1, "ZDC ", 5.6+boxpar[0], 0., tubpar[2] + zd1 + 56.3, 0, "ONLY");
   
-  tubspar[0] = 6.2;
-  tubspar[1] = 6.4;
+//  tubspar[0] = 6.2;  // R = 6.2 cm----------------------------------------
+//  tubspar[1] = 6.4;
+//  tubspar[2] = 400./2.;
+//  tubspar[3] = 180.-62.5;
+//  tubspar[4] = 180.+62.5;
+  tubspar[0] = 10.5;   // R = 10.5 cm------------------------------------------
+  tubspar[1] = 10.7;
   tubspar[2] = 400./2.;
-  tubspar[3] = 180.-62.5;
-  tubspar[4] = 180.+62.5;
+  tubspar[3] = 180.-75.5;
+  tubspar[4] = 180.+75.5;
   gMC->Gsvolu("QTD3", "TUBS", idtmed[6], tubspar, 5);
   gMC->Gspos("QTD3", 1, "ZDC ", -3., 0., tubpar[2] + zd1 + 56.3, 0, "ONLY");
 
@@ -437,7 +451,7 @@ void AliZDCv2::CreateBeamLine()
   Float_t zb = -800.;          // End of QBPM (from AliPIPEv0.cxx)
   tubpar[0] = 8.0/2.;
   tubpar[1] = 8.2/2.;
-  tubpar[2] = (1000+zb)/2.;    // From the end of QBPM to z=1000.
+  tubpar[2] = (1050+zb)/2.;    // From the end of QBPM to z=1050.
   gMC->Gsvolu("QT19", "TUBE", idtmed[7], tubpar, 3);
   gMC->Gspos("QT19", 1, "ZDC ", 0., 0., zb - tubpar[2], 0, "ONLY");
 
@@ -966,7 +980,7 @@ void AliZDCv2::CreateMaterials()
   
   // --- Tracking media parameters 
   Float_t epsil  = .01, stmin=0.01, stemax = 1.;
-  Int_t   isxfld = gAlice->Field()->Integ();
+//  Int_t   isxfld = gAlice->Field()->Integ();
   Float_t fieldm = 0., tmaxfd = 0.;
   Int_t   ifield = 0, isvolActive = 1, isvol = 0, inofld = 0;
   
@@ -986,7 +1000,7 @@ void AliZDCv2::CreateMaterials()
   
   ifield =2;
   fieldm = 45.;
-  AliMedium(11, "ZVOIM", 11, isvol, isxfld, fieldm, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(11, "ZVOIM", 11, isvol, ifield, fieldm, tmaxfd, stemax, deemax, epsil, stmin);
   
   // Thresholds for showering in the ZDCs 
   i = 1; //tantalum
@@ -1298,7 +1312,7 @@ void AliZDCv2::Hits2Digits(Int_t ntracks)
   
 }
 //_____________________________________________________________________________
- void AliZDCv2::MakeBranch(Option_t *opt, char *file)
+ void AliZDCv2::MakeBranch(Option_t *opt, const char *file)
 {
   //
   // Create a new branch in the current Root Tree
@@ -1318,8 +1332,8 @@ void AliZDCv2::Hits2Digits(Int_t ntracks)
     else fDigits = new TClonesArray ("AliZDCDigit",1000);
     char branchname[10];
     sprintf(branchname,"%s",GetName());
-    gAlice->MakeBranchInTree(gAlice->TreeD(), 
-                             branchname, &fDigits, fBufferSize, file) ;
+    MakeBranchInTree(gAlice->TreeD(), 
+                     branchname, &fDigits, fBufferSize, file) ;
     printf("* AliZDCv2::MakeBranch    * Making Branch %s for digits\n\n",branchname);
   }
        
@@ -1357,8 +1371,8 @@ void AliZDCv2::StepManager()
 //     printf("\n      # of p lost in Inner Triplet = %d\n",fpLostIT);
 //     printf("\n      # of p lost in D1  = %d\n",fpLostD1);
 //     printf("\n      # of p lost in TDI = %d\n",fpLostTDI);
-//        return;
 //      }
+//      return;
 //    }
   
   //Particle coordinates