From: morsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Mon, 21 May 2001 09:39:28 +0000 (+0000)
Subject: Minor modifications on the geometry. (Tapan Nayak)
X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=76ad67b540a67c55469e088a887b401520c98fdb;p=u%2Fmrichter%2FAliRoot.git

Minor modifications on the geometry. (Tapan Nayak)
---

diff --git a/PMD/AliPMDv0.cxx b/PMD/AliPMDv0.cxx
index b1202000ced..4c399fc5f90 100644
--- a/PMD/AliPMDv0.cxx
+++ b/PMD/AliPMDv0.cxx
@@ -14,6 +14,8 @@
  **************************************************************************/
 /*
 $Log$
+Revision 1.11  2001/05/14 14:01:04  morsch
+AliPMDv0 coarse geometry and AliPMDv1 detailed simulation, completely revised versions by Tapan Nayak.
 */
 
 //
@@ -275,7 +277,8 @@ void AliPMDv0::CreateSupermodule()
   z_air1= -dpara_sm1[2] + th_base + dpara_air[2]; 
   gMC->Gspos("EAIR", 1, "ESMA", 0., 0., z_air1, 0, "ONLY");
   z_gas=z_air1+dpara_air[2]+ th_pcb + dpara1[2]; 
-  gMC->Gspos("EHC1", 1, "ESMA", 0., 0., z_gas, 0, "ONLY");
+  //Line below Commented for version 0 of PMD routine
+  //  gMC->Gspos("EHC1", 1, "ESMA", 0., 0., z_gas, 0, "ONLY");
   z_air2=z_gas+dpara1[2]+ th_pcb + dpara_air[2]; 
   gMC->Gspos("EAIR", 2, "ESMA", 0., 0., z_air2, 0, "ONLY");
 
@@ -284,7 +287,8 @@ void AliPMDv0::CreateSupermodule()
   z_air1= -dpara_sm1[2] + th_pcb + dpara_air[2]; 
   gMC->Gspos("EAIR", 3, "ESMB", 0., 0., z_air1, 0, "ONLY");
   z_gas=z_air1+dpara_air[2]+ th_pcb + dpara1[2]; 
-  gMC->Gspos("EHC1", 2, "ESMB", 0., 0., z_gas, 0, "ONLY");
+  //Line below Commented for version 0 of PMD routine
+  //  gMC->Gspos("EHC1", 2, "ESMB", 0., 0., z_gas, 0, "ONLY");
   z_air2=z_gas+dpara1[2]+ th_pcb + dpara_air[2]; 
   gMC->Gspos("EAIR", 4, "ESMB", 0., 0., z_air2, 0, "ONLY");
 
@@ -349,7 +353,8 @@ void AliPMDv0::CreateSupermodule()
   z_air1= -dpara_sm2[2] + th_base + dpara2_air[2]; 
   gMC->Gspos("EAIX", 1, "ESMX", 0., 0., z_air1, 0, "ONLY");
   z_gas=z_air1+dpara2_air[2]+ th_pcb + dpara2[2]; 
-  gMC->Gspos("EHC2", 1, "ESMX", 0., 0., z_gas, 0, "ONLY");
+  //Line below Commented for version 0 of PMD routine
+  //  gMC->Gspos("EHC2", 1, "ESMX", 0., 0., z_gas, 0, "ONLY");
   z_air2=z_gas+dpara2[2]+ th_pcb + dpara2_air[2]; 
   gMC->Gspos("EAIX", 2, "ESMX", 0., 0., z_air2, 0, "ONLY");
 
@@ -358,7 +363,8 @@ void AliPMDv0::CreateSupermodule()
   z_air1= -dpara_sm2[2] + th_pcb + dpara2_air[2]; 
   gMC->Gspos("EAIX", 3, "ESMY", 0., 0., z_air1, 0, "ONLY");
   z_gas=z_air1+dpara2_air[2]+ th_pcb + dpara2[2]; 
-  gMC->Gspos("EHC2", 2, "ESMY", 0., 0., z_gas, 0, "ONLY");
+  //Line below Commented for version 0 of PMD routine
+  //  gMC->Gspos("EHC2", 2, "ESMY", 0., 0., z_gas, 0, "ONLY");
   z_air2=z_gas+dpara2[2]+ th_pcb + dpara2_air[2]; 
   gMC->Gspos("EAIX", 4, "ESMY", 0., 0., z_air2, 0, "ONLY");
 
@@ -425,7 +431,8 @@ void AliPMDv0::CreateSupermodule()
   z_air1= -dpara_sm3[2] + th_base + dpara3_air[2]; 
   gMC->Gspos("EAIP", 1, "ESMP", 0., 0., z_air1, 0, "ONLY");
   z_gas=z_air1+dpara3_air[2]+ th_pcb + dpara3[2]; 
-  gMC->Gspos("EHC3", 1, "ESMP", 0., 0., z_gas, 0, "ONLY");
+  //Line below Commented for version 0 of PMD routine
+  //  gMC->Gspos("EHC3", 1, "ESMP", 0., 0., z_gas, 0, "ONLY");
   z_air2=z_gas+dpara3[2]+ th_pcb + dpara3_air[2]; 
   gMC->Gspos("EAIP", 2, "ESMP", 0., 0., z_air2, 0, "ONLY");
 
@@ -434,7 +441,8 @@ void AliPMDv0::CreateSupermodule()
   z_air1= -dpara_sm3[2] + th_pcb + dpara3_air[2]; 
   gMC->Gspos("EAIP", 3, "ESMQ", 0., 0., z_air1, 0, "ONLY");
   z_gas=z_air1+dpara3_air[2]+ th_pcb + dpara3[2]; 
-  gMC->Gspos("EHC3", 2, "ESMQ", 0., 0., z_gas, 0, "ONLY");
+  //Line below Commented for version 0 of PMD routine
+  //  gMC->Gspos("EHC3", 2, "ESMQ", 0., 0., z_gas, 0, "ONLY");
   z_air2=z_gas+dpara3[2]+ th_pcb + dpara3_air[2]; 
   gMC->Gspos("EAIP", 4, "ESMQ", 0., 0., z_air2, 0, "ONLY");
 
diff --git a/PMD/AliPMDv1.cxx b/PMD/AliPMDv1.cxx
index 7e26e74ab4d..2fad56b894b 100644
--- a/PMD/AliPMDv1.cxx
+++ b/PMD/AliPMDv1.cxx
@@ -649,7 +649,7 @@ void AliPMDv1::CreatePMD()
 
   Float_t Al_rod[3] ;
   Al_rod[0] = sm_length * 3/2. - gaspmd[5]/2 - boundary ;
-  Al_rod[1] = boundary;
+  Al_rod[1] = boundary - 0.5*cell_radius*root3_2;
   Al_rod[2] = dm_thick/2.;
 
   gMC->Gsvolu("EALM","BOX ", idtmed[698], Al_rod, 3);
@@ -721,13 +721,11 @@ void AliPMDv1::CreatePMD()
 	  xpos[i]=xmod[j] + xsup[i]*TMath::Cos(theta[j]) - ysup[i]*TMath::Sin(theta[j]);
 	  ypos[i]=ymod[j] + xsup[i]*TMath::Sin(theta[j]) + ysup[i]*TMath::Cos(theta[j]);
 
-	  if(fDebug) 
-	    printf("%s: %f %f \n", ClassName(), xpos[i], ypos[i]);
+	  printf("%f %f \n", xpos[i], ypos[i]);
 
 	  num_mod = num_mod+1;
 
-	  if(fDebug)
-	    printf("\n%s: Num_mod %d\n",ClassName(),num_mod);
+	  printf("\nNum_mod %d\n",num_mod);
 
 	  gMC->Gsposp("EMM1", num_mod + 6, "EPMD", xpos[i],ypos[i], 0., irotate[j], "ONLY", dpara_emm1, 6);
 
@@ -925,19 +923,17 @@ void AliPMDv1::Init()
   Int_t i;
   kdet=1;
   //
-  if(fDebug) {
-    printf("\n%s: ",ClassName());
-    for(i=0;i<35;i++) printf("*");
-    printf(" PMD_INIT ");
-    for(i=0;i<35;i++) printf("*");
-    printf("\n%s: ",ClassName());
-    printf("                 PMD simulation package (v1) initialised\n");
-    printf("%s: parameters of pmd\n",ClassName());
-    printf("%s: %10.2f %10.2f %10.2f %10.2f\n",ClassName(),cell_radius,cell_wall,cell_depth,zdist1 );
-    printf("%s: ",ClassName());
-    for(i=0;i<80;i++) printf("*");
-    printf("\n");
-  }
+  printf("\n");
+  for(i=0;i<35;i++) printf("*");
+  printf(" PMD_INIT ");
+  for(i=0;i<35;i++) printf("*");
+  printf("\n");
+  printf("                 PMD simulation package (v1) initialised\n");
+  printf(" parameters of pmd\n");
+  printf("%10.2f %10.2f %10.2f %10.2f\n", cell_radius,cell_wall,cell_depth,zdist1 );
+  
+  for(i=0;i<80;i++) printf("*");
+  printf("\n");
   
   Int_t *idtmed = fIdtmed->GetArray()-599;
   fMedSens=idtmed[605-1];