From ef61784c5ecdfa8c947a3dc97acda41bdc840520 Mon Sep 17 00:00:00 2001 From: hristov Date: Mon, 27 Jan 2003 14:26:05 +0000 Subject: [PATCH] Replacing Gsposp by Gspos (R.Brun) --- PMD/AliPMDv0.cxx | 52 +++++++++++++++++++++++++----------------------- PMD/AliPMDv1.cxx | 20 +++++++++++-------- 2 files changed, 39 insertions(+), 33 deletions(-) diff --git a/PMD/AliPMDv0.cxx b/PMD/AliPMDv0.cxx index 40f39685ca6..8ff422d39a6 100644 --- a/PMD/AliPMDv0.cxx +++ b/PMD/AliPMDv0.cxx @@ -14,6 +14,9 @@ **************************************************************************/ /* $Log$ +Revision 1.16 2002/11/21 22:57:02 alibrary +Removing AliMC and AliMCProcess + Revision 1.15 2002/10/23 07:36:35 alibrary Introducing Riostream.h @@ -218,7 +221,7 @@ void AliPMDv0::CreateSupermodule() // --- place inner hex inside outer hex - gMC->Gsposp("ECAR", 1, "ECCU", 0., 0., 0., 0, "ONLY", hexd2, 10); + gMC->Gspos("ECAR", 1, "ECCU", 0., 0., 0., 0, "ONLY"); // Rhombus shaped supermodules (defined by PARA) @@ -272,7 +275,7 @@ void AliPMDv0::CreateSupermodule() } for (i = 1; i <= ncell_sm; ++i) { number = i+(j-1)*ncell_sm; - gMC->Gsposp("ECCU", number, "EHC1", xb,yb,zb, ihrotm, "ONLY", hexd1,10); + gMC->Gspos("ECCU", number, "EHC1", xb,yb,zb, ihrotm, "ONLY"); xb += (hexd1[6]*2.); } xrow = xrow+1; @@ -351,7 +354,7 @@ void AliPMDv0::CreateSupermodule() } for (i = 1; i <= ncell_sm; ++i) { number = i+(j-1)*ncell_sm; - gMC->Gsposp("ECCU", number, "EHC2", xb,yb,zb, ihrotm, "ONLY", hexd1,10); + gMC->Gspos("ECCU", number, "EHC2", xb,yb,zb, ihrotm, "ONLY"); xb += (hexd1[6]*2.); } xrow = xrow+1; @@ -430,7 +433,7 @@ void AliPMDv0::CreateSupermodule() } for (i = 1; i <= (ncell_sm - ncell_hole); ++i) { number = i+(j-1)*(ncell_sm - ncell_hole); - gMC->Gsposp("ECCU", number, "EHC3", xb,yb,zb, ihrotm, "ONLY", hexd1,10); + gMC->Gspos("ECCU", number, "EHC3", xb,yb,zb, ihrotm, "ONLY"); xb += (hexd1[6]*2.); } xrow = xrow+1; @@ -722,35 +725,33 @@ void AliPMDv0::CreatePMD() Int_t irotate[3] = {0, jhrot12, jhrot13}; num_mod=0; - for (j=0; j<3; ++j) - { - gMC->Gsposp("EALM", j+1, "EPMD", xalm[j],yalm[j], 0., irotate[j], "ONLY", Al_rod, 3); - x2=xemm2*TMath::Cos(theta[j]) - yemm2*TMath::Sin(theta[j]); - y2=xemm2*TMath::Sin(theta[j]) + yemm2*TMath::Cos(theta[j]); + for (j=0; j<3; ++j) { + gMC->Gspos("EALM", j+1, "EPMD", xalm[j],yalm[j], 0., irotate[j], "ONLY"); + x2=xemm2*TMath::Cos(theta[j]) - yemm2*TMath::Sin(theta[j]); + y2=xemm2*TMath::Sin(theta[j]) + yemm2*TMath::Cos(theta[j]); - gMC->Gsposp("EMM2", j+1, "EPMD", x2,y2, 0., irotate[j], "ONLY", dpara_emm2, 6); + gMC->Gspos("EMM2", j+1, "EPMD", x2,y2, 0., irotate[j], "ONLY"); - x3=xemm3*TMath::Cos(theta[j]) - yemm3*TMath::Sin(theta[j]); - y3=xemm3*TMath::Sin(theta[j]) + yemm3*TMath::Cos(theta[j]); + x3=xemm3*TMath::Cos(theta[j]) - yemm3*TMath::Sin(theta[j]); + y3=xemm3*TMath::Sin(theta[j]) + yemm3*TMath::Cos(theta[j]); - gMC->Gsposp("EMM3", j+4, "EPMD", x3,y3, 0., irotate[j], "ONLY", dpara_emm3, 6); + gMC->Gspos("EMM3", j+4, "EPMD", x3,y3, 0., irotate[j], "ONLY"); - for (i=1; i<9; ++i) - { - 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]); + for (i=1; i<9; ++i) { + 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]); - num_mod = num_mod+1; + num_mod = num_mod+1; - if(fDebug) - printf("\n%s: Num_mod %d\n",ClassName(),num_mod); + if(fDebug) + printf("\n%s: Num_mod %d\n",ClassName(),num_mod); - gMC->Gsposp("EMM1", num_mod + 6, "EPMD", xpos[i],ypos[i], 0., irotate[j], "ONLY", dpara_emm1, 6); + gMC->Gspos("EMM1", num_mod + 6, "EPMD", xpos[i],ypos[i], 0., irotate[j], "ONLY"); - } - } + } + } // place EHOL in the centre of EPMD @@ -1058,3 +1059,4 @@ void AliPMDv0::GetParameters() + diff --git a/PMD/AliPMDv1.cxx b/PMD/AliPMDv1.cxx index 89e1fca7faa..75b53ebfba3 100644 --- a/PMD/AliPMDv1.cxx +++ b/PMD/AliPMDv1.cxx @@ -14,6 +14,9 @@ **************************************************************************/ /* $Log$ +Revision 1.18 2002/11/21 22:57:02 alibrary +Removing AliMC and AliMCProcess + Revision 1.17 2002/10/23 07:36:35 alibrary Introducing Riostream.h @@ -219,7 +222,7 @@ void AliPMDv1::CreateSupermodule() // --- place inner hex inside outer hex - gMC->Gsposp("ECAR", 1, "ECCU", 0., 0., 0., 0, "ONLY", hexd2, 10); + gMC->Gspos("ECAR", 1, "ECCU", 0., 0., 0., 0, "ONLY"); // Rhombus shaped supermodules (defined by PARA) @@ -273,7 +276,7 @@ void AliPMDv1::CreateSupermodule() } for (i = 1; i <= ncell_sm; ++i) { number = i+(j-1)*ncell_sm; - gMC->Gsposp("ECCU", number, "EHC1", xb,yb,zb, ihrotm, "ONLY", hexd1,10); + gMC->Gspos("ECCU", number, "EHC1", xb,yb,zb, ihrotm, "ONLY"); xb += (hexd1[6]*2.); } xrow = xrow+1; @@ -350,7 +353,7 @@ void AliPMDv1::CreateSupermodule() } for (i = 1; i <= ncell_sm; ++i) { number = i+(j-1)*ncell_sm; - gMC->Gsposp("ECCU", number, "EHC2", xb,yb,zb, ihrotm, "ONLY", hexd1,10); + gMC->Gspos("ECCU", number, "EHC2", xb,yb,zb, ihrotm, "ONLY"); xb += (hexd1[6]*2.); } xrow = xrow+1; @@ -427,7 +430,7 @@ void AliPMDv1::CreateSupermodule() } for (i = 1; i <= (ncell_sm - ncell_hole); ++i) { number = i+(j-1)*(ncell_sm - ncell_hole); - gMC->Gsposp("ECCU", number, "EHC3", xb,yb,zb, ihrotm, "ONLY", hexd1,10); + gMC->Gspos("ECCU", number, "EHC3", xb,yb,zb, ihrotm, "ONLY"); xb += (hexd1[6]*2.); } xrow = xrow+1; @@ -719,16 +722,16 @@ void AliPMDv1::CreatePMD() num_mod=0; for (j=0; j<3; ++j) { - gMC->Gsposp("EALM", j+1, "EPMD", xalm[j],yalm[j], 0., irotate[j], "ONLY", Al_rod, 3); + gMC->Gspos("EALM", j+1, "EPMD", xalm[j],yalm[j], 0., irotate[j], "ONLY"); x2=xemm2*TMath::Cos(theta[j]) - yemm2*TMath::Sin(theta[j]); y2=xemm2*TMath::Sin(theta[j]) + yemm2*TMath::Cos(theta[j]); - gMC->Gsposp("EMM2", j+1, "EPMD", x2,y2, 0., irotate[j], "ONLY", dpara_emm2, 6); + gMC->Gspos("EMM2", j+1, "EPMD", x2,y2, 0., irotate[j], "ONLY"); x3=xemm3*TMath::Cos(theta[j]) - yemm3*TMath::Sin(theta[j]); y3=xemm3*TMath::Sin(theta[j]) + yemm3*TMath::Cos(theta[j]); - gMC->Gsposp("EMM3", j+4, "EPMD", x3,y3, 0., irotate[j], "ONLY", dpara_emm3, 6); + gMC->Gspos("EMM3", j+4, "EPMD", x3,y3, 0., irotate[j], "ONLY"); for (i=1; i<9; ++i) { @@ -743,7 +746,7 @@ void AliPMDv1::CreatePMD() if(fDebug) printf("\n%s: Num_mod %d\n",ClassName(),num_mod); - gMC->Gsposp("EMM1", num_mod + 6, "EPMD", xpos[i],ypos[i], 0., irotate[j], "ONLY", dpara_emm1, 6); + gMC->Gspos("EMM1", num_mod + 6, "EPMD", xpos[i],ypos[i], 0., irotate[j], "ONLY"); } } @@ -1055,3 +1058,4 @@ void AliPMDv1::GetParameters() + -- 2.39.3