X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=MUON%2FAliMUONv1.cxx;h=33c8f036d64e975e544e08b70bf149b6c67855a1;hp=d95916f70ad36d613fc21c1cee57b3fe4c17c953;hb=3f08857e223915e5b30de03d12aab30e0068aeea;hpb=a083207dba1af1741ea16ae3f1c7402901e89562 diff --git a/MUON/AliMUONv1.cxx b/MUON/AliMUONv1.cxx index d95916f70ad..33c8f036d64 100644 --- a/MUON/AliMUONv1.cxx +++ b/MUON/AliMUONv1.cxx @@ -15,6 +15,65 @@ /* $Log$ +Revision 1.33 2002/07/23 10:02:46 morsch +All volume names start with "S". + +Revision 1.32 2002/05/02 12:51:10 morsch +For G4: gMC->VolId(...) replaced by gAlice->GetModule(...). + +Revision 1.31 2002/03/13 07:55:04 jchudoba +Correction of the errourness last commit. + +Revision 1.29 2001/06/21 14:54:37 morsch +Put volumes of station 3 into DIPO if present. (A. de Falco) + +Revision 1.28 2001/05/16 14:57:17 alibrary +New files for folders and Stack + +Revision 1.27 2001/04/06 11:24:43 morsch +Dependency on implementations of AliSegmentation and AliMUONResponse moved to AliMUONFactory class. +Static method Build() builds the MUON system out of chambers, segmentation and response. + +Revision 1.26 2001/03/17 10:07:20 morsch +Correct inconsistent variable name / method name / comments. + +Revision 1.25 2001/03/16 15:32:06 morsch +Corrections of overlap with beam shield and dipole (A. de Falco) + +Revision 1.24 2001/03/14 17:22:15 pcrochet +Geometry of the trigger chambers : a vertical gap of has been introduced around x=0 according fig.3.27 of the TDR (P.Dupieux) + +Revision 1.23 2001/01/18 15:23:49 egangler +Bug correction in StepManager : +Now the systematic offset with angle is cured + +Revision 1.22 2001/01/17 21:01:21 hristov +Unused variable removed + +Revision 1.21 2000/12/20 13:00:22 egangler + +Added charge correlation between cathods. +In Config_slat.C, use + MUON->Chamber(chamber-1).SetChargeCorrel(0.11); to set the RMS of + q1/q2 to 11 % (number from Alberto) + This is stored in AliMUONChamber fChargeCorrel member. + At generation time, when a tracks enters the volume, + AliMUONv1::StepManager calls + AliMUONChamber::ChargeCorrelationInit() to set the current value of + fCurrentCorrel which is then used at Disintegration level to scale + appropriately the PadHit charges. + +Revision 1.20 2000/12/04 17:48:23 gosset +Modifications for stations 1 et 2 mainly: +* station 1 with 4 mm gas gap and smaller cathode segmentation... +* stations 1 and 2 with "grey" frame crosses +* mean noise at 1.5 ADC channel +* Ar-CO2 gas (80%+20%) + +Revision 1.19 2000/12/02 17:15:46 morsch +Correction of dead zones in inner regions of stations 3-5 +Correction of length of slats 3 and 9 of station 4. + Revision 1.17 2000/11/24 12:57:10 morsch New version of geometry for stations 3-5 "Slats" (A. de Falco) - sensitive region at station 3 inner radius @@ -112,6 +171,7 @@ Log messages included. #include "AliMUONPadHit.h" #include "AliMUONConstants.h" #include "AliMUONTriggerCircuit.h" +#include "AliMUONFactory.h" ClassImp(AliMUONv1) @@ -127,6 +187,7 @@ AliMUONv1::AliMUONv1(const char *name, const char *title) : AliMUON(name,title) { // Constructor + AliMUONFactory::Build(this, title); } //___________________________________________ @@ -143,15 +204,25 @@ void AliMUONv1::CreateGeometry() // Float_t bpar[3]; Float_t tpar[3]; - Float_t pgpar[10]; +// Float_t pgpar[10]; Float_t zpos1, zpos2, zfpos; + // Outer excess and inner recess for mother volume radius + // with respect to ROuter and RInner Float_t dframep=.001; // Value for station 3 should be 6 ... - Float_t dframep1=.001; -// Bool_t frames=kTRUE; - Bool_t frames=kFALSE; + // Width (RdPhi) of the frame crosses for stations 1 and 2 (cm) +// Float_t dframep1=.001; + Float_t dframep1 = 11.0; +// Bool_t frameCrosses=kFALSE; + Bool_t frameCrosses=kTRUE; + Float_t *dum=0; - Float_t dframez=0.9; - Float_t dr; +// Float_t dframez=0.9; + // Half of the total thickness of frame crosses (including DAlu) + // for each chamber in stations 1 and 2: + // 3% of X0 of composite material, + // but taken as Aluminium here, with same thickness in number of X0 + Float_t dframez = 3. * 8.9 / 100; +// Float_t dr; Float_t dstation; // @@ -171,12 +242,13 @@ void AliMUONv1::CreateGeometry() // // pointer to the current chamber // pointer to the current chamber - Int_t idAlu1=idtmed[1103]; - Int_t idAlu2=idtmed[1104]; + Int_t idAlu1=idtmed[1103]; // medium 4 + Int_t idAlu2=idtmed[1104]; // medium 5 // Int_t idAlu1=idtmed[1100]; // Int_t idAlu2=idtmed[1100]; - Int_t idAir=idtmed[1100]; - Int_t idGas=idtmed[1105]; + Int_t idAir=idtmed[1100]; // medium 1 +// Int_t idGas=idtmed[1105]; // medium 6 = Ar-isoC4H10 gas + Int_t idGas=idtmed[1108]; // medium 9 = Ar-CO2 gas (80%+20%) AliMUONChamber *iChamber, *iChamber1, *iChamber2; @@ -196,90 +268,101 @@ void AliMUONv1::CreateGeometry() zpos1=iChamber1->Z(); zpos2=iChamber2->Z(); dstation = zpos2 - zpos1; + // DGas decreased from standard one (0.5) + iChamber->SetDGas(0.4); iChamber2->SetDGas(0.4); + // DAlu increased from standard one (3% of X0), + // because more electronics with smaller pads + iChamber->SetDAlu(3.5 * 8.9 / 100.); iChamber2->SetDAlu(3.5 * 8.9 / 100.); zfpos=-(iChamber->DGas()+dframez+iChamber->DAlu())/2; // // Mother volume - tpar[0] = iChamber->RInner()-dframep1; - tpar[1] = (iChamber->ROuter()+dframep1)/TMath::Cos(phi); + tpar[0] = iChamber->RInner()-dframep; + tpar[1] = (iChamber->ROuter()+dframep)/TMath::Cos(phi); tpar[2] = dstation/5; - gMC->Gsvolu("C01M", "TUBE", idAir, tpar, 3); - gMC->Gsvolu("C02M", "TUBE", idAir, tpar, 3); - gMC->Gspos("C01M", 1, "ALIC", 0., 0., zpos1 , 0, "ONLY"); - gMC->Gspos("C02M", 1, "ALIC", 0., 0., zpos2 , 0, "ONLY"); -// Aluminium frames -// Outer frames - pgpar[0] = 360/12/2; - pgpar[1] = 360.; - pgpar[2] = 12.; - pgpar[3] = 2; - pgpar[4] = -dframez/2; - pgpar[5] = iChamber->ROuter(); - pgpar[6] = pgpar[5]+dframep1; - pgpar[7] = +dframez/2; - pgpar[8] = pgpar[5]; - pgpar[9] = pgpar[6]; - gMC->Gsvolu("C01O", "PGON", idAlu1, pgpar, 10); - gMC->Gsvolu("C02O", "PGON", idAlu1, pgpar, 10); - gMC->Gspos("C01O",1,"C01M", 0.,0.,-zfpos, 0,"ONLY"); - gMC->Gspos("C01O",2,"C01M", 0.,0.,+zfpos, 0,"ONLY"); - gMC->Gspos("C02O",1,"C02M", 0.,0.,-zfpos, 0,"ONLY"); - gMC->Gspos("C02O",2,"C02M", 0.,0.,+zfpos, 0,"ONLY"); -// -// Inner frame - tpar[0]= iChamber->RInner()-dframep1; - tpar[1]= iChamber->RInner(); - tpar[2]= dframez/2; - gMC->Gsvolu("C01I", "TUBE", idAlu1, tpar, 3); - gMC->Gsvolu("C02I", "TUBE", idAlu1, tpar, 3); - - gMC->Gspos("C01I",1,"C01M", 0.,0.,-zfpos, 0,"ONLY"); - gMC->Gspos("C01I",2,"C01M", 0.,0.,+zfpos, 0,"ONLY"); - gMC->Gspos("C02I",1,"C02M", 0.,0.,-zfpos, 0,"ONLY"); - gMC->Gspos("C02I",2,"C02M", 0.,0.,+zfpos, 0,"ONLY"); + gMC->Gsvolu("S01M", "TUBE", idAir, tpar, 3); + gMC->Gsvolu("S02M", "TUBE", idAir, tpar, 3); + gMC->Gspos("S01M", 1, "ALIC", 0., 0., zpos1 , 0, "ONLY"); + gMC->Gspos("S02M", 1, "ALIC", 0., 0., zpos2 , 0, "ONLY"); +// // Aluminium frames +// // Outer frames +// pgpar[0] = 360/12/2; +// pgpar[1] = 360.; +// pgpar[2] = 12.; +// pgpar[3] = 2; +// pgpar[4] = -dframez/2; +// pgpar[5] = iChamber->ROuter(); +// pgpar[6] = pgpar[5]+dframep1; +// pgpar[7] = +dframez/2; +// pgpar[8] = pgpar[5]; +// pgpar[9] = pgpar[6]; +// gMC->Gsvolu("S01O", "PGON", idAlu1, pgpar, 10); +// gMC->Gsvolu("S02O", "PGON", idAlu1, pgpar, 10); +// gMC->Gspos("S01O",1,"S01M", 0.,0.,-zfpos, 0,"ONLY"); +// gMC->Gspos("S01O",2,"S01M", 0.,0.,+zfpos, 0,"ONLY"); +// gMC->Gspos("S02O",1,"S02M", 0.,0.,-zfpos, 0,"ONLY"); +// gMC->Gspos("S02O",2,"S02M", 0.,0.,+zfpos, 0,"ONLY"); +// // +// // Inner frame +// tpar[0]= iChamber->RInner()-dframep1; +// tpar[1]= iChamber->RInner(); +// tpar[2]= dframez/2; +// gMC->Gsvolu("S01I", "TUBE", idAlu1, tpar, 3); +// gMC->Gsvolu("S02I", "TUBE", idAlu1, tpar, 3); + +// gMC->Gspos("S01I",1,"S01M", 0.,0.,-zfpos, 0,"ONLY"); +// gMC->Gspos("S01I",2,"S01M", 0.,0.,+zfpos, 0,"ONLY"); +// gMC->Gspos("S02I",1,"S02M", 0.,0.,-zfpos, 0,"ONLY"); +// gMC->Gspos("S02I",2,"S02M", 0.,0.,+zfpos, 0,"ONLY"); // // Frame Crosses - if (frames) { - - bpar[0] = (iChamber->ROuter() - iChamber->RInner())/2; + if (frameCrosses) { + // outside gas + // security for inside mother volume + bpar[0] = (iChamber->ROuter() - iChamber->RInner()) + * TMath::Cos(TMath::ASin(dframep1 / + (iChamber->ROuter() - iChamber->RInner()))) + / 2.0; bpar[1] = dframep1/2; - bpar[2] = dframez/2; - gMC->Gsvolu("C01B", "BOX", idAlu1, bpar, 3); - gMC->Gsvolu("C02B", "BOX", idAlu1, bpar, 3); + // total thickness will be (4 * bpar[2]) for each chamber, + // which has to be equal to (2 * dframez) - DAlu + bpar[2] = (2.0 * dframez - iChamber->DAlu()) / 4.0; + gMC->Gsvolu("S01B", "BOX", idAlu1, bpar, 3); + gMC->Gsvolu("S02B", "BOX", idAlu1, bpar, 3); - gMC->Gspos("C01B",1,"C01M", +iChamber->RInner()+bpar[0] , 0,-zfpos, + gMC->Gspos("S01B",1,"S01M", +iChamber->RInner()+bpar[0] , 0,-zfpos, idrotm[1100],"ONLY"); - gMC->Gspos("C01B",2,"C01M", -iChamber->RInner()-bpar[0] , 0,-zfpos, + gMC->Gspos("S01B",2,"S01M", -iChamber->RInner()-bpar[0] , 0,-zfpos, idrotm[1100],"ONLY"); - gMC->Gspos("C01B",3,"C01M", 0, +iChamber->RInner()+bpar[0] ,-zfpos, + gMC->Gspos("S01B",3,"S01M", 0, +iChamber->RInner()+bpar[0] ,-zfpos, idrotm[1101],"ONLY"); - gMC->Gspos("C01B",4,"C01M", 0, -iChamber->RInner()-bpar[0] ,-zfpos, + gMC->Gspos("S01B",4,"S01M", 0, -iChamber->RInner()-bpar[0] ,-zfpos, idrotm[1101],"ONLY"); - gMC->Gspos("C01B",5,"C01M", +iChamber->RInner()+bpar[0] , 0,+zfpos, + gMC->Gspos("S01B",5,"S01M", +iChamber->RInner()+bpar[0] , 0,+zfpos, idrotm[1100],"ONLY"); - gMC->Gspos("C01B",6,"C01M", -iChamber->RInner()-bpar[0] , 0,+zfpos, + gMC->Gspos("S01B",6,"S01M", -iChamber->RInner()-bpar[0] , 0,+zfpos, idrotm[1100],"ONLY"); - gMC->Gspos("C01B",7,"C01M", 0, +iChamber->RInner()+bpar[0] ,+zfpos, + gMC->Gspos("S01B",7,"S01M", 0, +iChamber->RInner()+bpar[0] ,+zfpos, idrotm[1101],"ONLY"); - gMC->Gspos("C01B",8,"C01M", 0, -iChamber->RInner()-bpar[0] ,+zfpos, + gMC->Gspos("S01B",8,"S01M", 0, -iChamber->RInner()-bpar[0] ,+zfpos, idrotm[1101],"ONLY"); - gMC->Gspos("C02B",1,"C02M", +iChamber->RInner()+bpar[0] , 0,-zfpos, + gMC->Gspos("S02B",1,"S02M", +iChamber->RInner()+bpar[0] , 0,-zfpos, idrotm[1100],"ONLY"); - gMC->Gspos("C02B",2,"C02M", -iChamber->RInner()-bpar[0] , 0,-zfpos, + gMC->Gspos("S02B",2,"S02M", -iChamber->RInner()-bpar[0] , 0,-zfpos, idrotm[1100],"ONLY"); - gMC->Gspos("C02B",3,"C02M", 0, +iChamber->RInner()+bpar[0] ,-zfpos, + gMC->Gspos("S02B",3,"S02M", 0, +iChamber->RInner()+bpar[0] ,-zfpos, idrotm[1101],"ONLY"); - gMC->Gspos("C02B",4,"C02M", 0, -iChamber->RInner()-bpar[0] ,-zfpos, + gMC->Gspos("S02B",4,"S02M", 0, -iChamber->RInner()-bpar[0] ,-zfpos, idrotm[1101],"ONLY"); - gMC->Gspos("C02B",5,"C02M", +iChamber->RInner()+bpar[0] , 0,+zfpos, + gMC->Gspos("S02B",5,"S02M", +iChamber->RInner()+bpar[0] , 0,+zfpos, idrotm[1100],"ONLY"); - gMC->Gspos("C02B",6,"C02M", -iChamber->RInner()-bpar[0] , 0,+zfpos, + gMC->Gspos("S02B",6,"S02M", -iChamber->RInner()-bpar[0] , 0,+zfpos, idrotm[1100],"ONLY"); - gMC->Gspos("C02B",7,"C02M", 0, +iChamber->RInner()+bpar[0] ,+zfpos, + gMC->Gspos("S02B",7,"S02M", 0, +iChamber->RInner()+bpar[0] ,+zfpos, idrotm[1101],"ONLY"); - gMC->Gspos("C02B",8,"C02M", 0, -iChamber->RInner()-bpar[0] ,+zfpos, + gMC->Gspos("S02B",8,"S02M", 0, -iChamber->RInner()-bpar[0] ,+zfpos, idrotm[1101],"ONLY"); } // @@ -287,47 +370,48 @@ void AliMUONv1::CreateGeometry() tpar[0]= iChamber->RInner(); tpar[1]= iChamber->ROuter(); tpar[2] = (iChamber->DGas()+iChamber->DAlu())/2; - gMC->Gsvolu("C01A", "TUBE", idAlu2, tpar, 3); - gMC->Gsvolu("C02A", "TUBE",idAlu2, tpar, 3); - gMC->Gspos("C01A", 1, "C01M", 0., 0., 0., 0, "ONLY"); - gMC->Gspos("C02A", 1, "C02M", 0., 0., 0., 0, "ONLY"); + gMC->Gsvolu("S01A", "TUBE", idAlu2, tpar, 3); + gMC->Gsvolu("S02A", "TUBE",idAlu2, tpar, 3); + gMC->Gspos("S01A", 1, "S01M", 0., 0., 0., 0, "ONLY"); + gMC->Gspos("S02A", 1, "S02M", 0., 0., 0., 0, "ONLY"); // // Sensitive volumes // tpar[2] = iChamber->DGas(); tpar[2] = iChamber->DGas()/2; - gMC->Gsvolu("C01G", "TUBE", idtmed[1108], tpar, 3); - gMC->Gsvolu("C02G", "TUBE", idtmed[1108], tpar, 3); - gMC->Gspos("C01G", 1, "C01A", 0., 0., 0., 0, "ONLY"); - gMC->Gspos("C02G", 1, "C02A", 0., 0., 0., 0, "ONLY"); + gMC->Gsvolu("S01G", "TUBE", idGas, tpar, 3); + gMC->Gsvolu("S02G", "TUBE", idGas, tpar, 3); + gMC->Gspos("S01G", 1, "S01A", 0., 0., 0., 0, "ONLY"); + gMC->Gspos("S02G", 1, "S02A", 0., 0., 0., 0, "ONLY"); // -// Frame Crosses to be placed inside gas - if (frames) { - - dr = (iChamber->ROuter() - iChamber->RInner()); - bpar[0] = TMath::Sqrt(dr*dr-dframep1*dframep1/4)/2; - bpar[1] = dframep1/2; - bpar[2] = iChamber->DGas()/2; - gMC->Gsvolu("C01F", "BOX", idAlu1, bpar, 3); - gMC->Gsvolu("C02F", "BOX", idAlu1, bpar, 3); +// Frame Crosses to be placed inside gas + // NONE: chambers are sensitive everywhere +// if (frameCrosses) { + +// dr = (iChamber->ROuter() - iChamber->RInner()); +// bpar[0] = TMath::Sqrt(dr*dr-dframep1*dframep1/4)/2; +// bpar[1] = dframep1/2; +// bpar[2] = iChamber->DGas()/2; +// gMC->Gsvolu("S01F", "BOX", idAlu1, bpar, 3); +// gMC->Gsvolu("S02F", "BOX", idAlu1, bpar, 3); - gMC->Gspos("C01F",1,"C01G", +iChamber->RInner()+bpar[0] , 0, 0, - idrotm[1100],"ONLY"); - gMC->Gspos("C01F",2,"C01G", -iChamber->RInner()-bpar[0] , 0, 0, - idrotm[1100],"ONLY"); - gMC->Gspos("C01F",3,"C01G", 0, +iChamber->RInner()+bpar[0] , 0, - idrotm[1101],"ONLY"); - gMC->Gspos("C01F",4,"C01G", 0, -iChamber->RInner()-bpar[0] , 0, - idrotm[1101],"ONLY"); +// gMC->Gspos("S01F",1,"S01G", +iChamber->RInner()+bpar[0] , 0, 0, +// idrotm[1100],"ONLY"); +// gMC->Gspos("S01F",2,"S01G", -iChamber->RInner()-bpar[0] , 0, 0, +// idrotm[1100],"ONLY"); +// gMC->Gspos("S01F",3,"S01G", 0, +iChamber->RInner()+bpar[0] , 0, +// idrotm[1101],"ONLY"); +// gMC->Gspos("S01F",4,"S01G", 0, -iChamber->RInner()-bpar[0] , 0, +// idrotm[1101],"ONLY"); - gMC->Gspos("C02F",1,"C02G", +iChamber->RInner()+bpar[0] , 0, 0, - idrotm[1100],"ONLY"); - gMC->Gspos("C02F",2,"C02G", -iChamber->RInner()-bpar[0] , 0, 0, - idrotm[1100],"ONLY"); - gMC->Gspos("C02F",3,"C02G", 0, +iChamber->RInner()+bpar[0] , 0, - idrotm[1101],"ONLY"); - gMC->Gspos("C02F",4,"C02G", 0, -iChamber->RInner()-bpar[0] , 0, - idrotm[1101],"ONLY"); - } +// gMC->Gspos("S02F",1,"S02G", +iChamber->RInner()+bpar[0] , 0, 0, +// idrotm[1100],"ONLY"); +// gMC->Gspos("S02F",2,"S02G", -iChamber->RInner()-bpar[0] , 0, 0, +// idrotm[1100],"ONLY"); +// gMC->Gspos("S02F",3,"S02G", 0, +iChamber->RInner()+bpar[0] , 0, +// idrotm[1101],"ONLY"); +// gMC->Gspos("S02F",4,"S02G", 0, -iChamber->RInner()-bpar[0] , 0, +// idrotm[1101],"ONLY"); +// } } if (stations[1]) { @@ -342,6 +426,7 @@ void AliMUONv1::CreateGeometry() zpos1=iChamber1->Z(); zpos2=iChamber2->Z(); dstation = zpos2 - zpos1; + // DGas and DAlu not changed from standard values zfpos=-(iChamber->DGas()+dframez+iChamber->DAlu())/2; // @@ -350,83 +435,89 @@ void AliMUONv1::CreateGeometry() tpar[1] = (iChamber->ROuter()+dframep)/TMath::Cos(phi); tpar[2] = dstation/5; - gMC->Gsvolu("C03M", "TUBE", idAir, tpar, 3); - gMC->Gsvolu("C04M", "TUBE", idAir, tpar, 3); - gMC->Gspos("C03M", 1, "ALIC", 0., 0., zpos1 , 0, "ONLY"); - gMC->Gspos("C04M", 1, "ALIC", 0., 0., zpos2 , 0, "ONLY"); - -// Aluminium frames -// Outer frames - pgpar[0] = 360/12/2; - pgpar[1] = 360.; - pgpar[2] = 12.; - pgpar[3] = 2; - pgpar[4] = -dframez/2; - pgpar[5] = iChamber->ROuter(); - pgpar[6] = pgpar[5]+dframep; - pgpar[7] = +dframez/2; - pgpar[8] = pgpar[5]; - pgpar[9] = pgpar[6]; - gMC->Gsvolu("C03O", "PGON", idAlu1, pgpar, 10); - gMC->Gsvolu("C04O", "PGON", idAlu1, pgpar, 10); - gMC->Gspos("C03O",1,"C03M", 0.,0.,-zfpos, 0,"ONLY"); - gMC->Gspos("C03O",2,"C03M", 0.,0.,+zfpos, 0,"ONLY"); - gMC->Gspos("C04O",1,"C04M", 0.,0.,-zfpos, 0,"ONLY"); - gMC->Gspos("C04O",2,"C04M", 0.,0.,+zfpos, 0,"ONLY"); -// -// Inner frame - tpar[0]= iChamber->RInner()-dframep; - tpar[1]= iChamber->RInner(); - tpar[2]= dframez/2; - gMC->Gsvolu("C03I", "TUBE", idAlu1, tpar, 3); - gMC->Gsvolu("C04I", "TUBE", idAlu1, tpar, 3); - - gMC->Gspos("C03I",1,"C03M", 0.,0.,-zfpos, 0,"ONLY"); - gMC->Gspos("C03I",2,"C03M", 0.,0.,+zfpos, 0,"ONLY"); - gMC->Gspos("C04I",1,"C04M", 0.,0.,-zfpos, 0,"ONLY"); - gMC->Gspos("C04I",2,"C04M", 0.,0.,+zfpos, 0,"ONLY"); + gMC->Gsvolu("S03M", "TUBE", idAir, tpar, 3); + gMC->Gsvolu("S04M", "TUBE", idAir, tpar, 3); + gMC->Gspos("S03M", 1, "ALIC", 0., 0., zpos1 , 0, "ONLY"); + gMC->Gspos("S04M", 1, "ALIC", 0., 0., zpos2 , 0, "ONLY"); + +// // Aluminium frames +// // Outer frames +// pgpar[0] = 360/12/2; +// pgpar[1] = 360.; +// pgpar[2] = 12.; +// pgpar[3] = 2; +// pgpar[4] = -dframez/2; +// pgpar[5] = iChamber->ROuter(); +// pgpar[6] = pgpar[5]+dframep; +// pgpar[7] = +dframez/2; +// pgpar[8] = pgpar[5]; +// pgpar[9] = pgpar[6]; +// gMC->Gsvolu("S03O", "PGON", idAlu1, pgpar, 10); +// gMC->Gsvolu("S04O", "PGON", idAlu1, pgpar, 10); +// gMC->Gspos("S03O",1,"S03M", 0.,0.,-zfpos, 0,"ONLY"); +// gMC->Gspos("S03O",2,"S03M", 0.,0.,+zfpos, 0,"ONLY"); +// gMC->Gspos("S04O",1,"S04M", 0.,0.,-zfpos, 0,"ONLY"); +// gMC->Gspos("S04O",2,"S04M", 0.,0.,+zfpos, 0,"ONLY"); +// // +// // Inner frame +// tpar[0]= iChamber->RInner()-dframep; +// tpar[1]= iChamber->RInner(); +// tpar[2]= dframez/2; +// gMC->Gsvolu("S03I", "TUBE", idAlu1, tpar, 3); +// gMC->Gsvolu("S04I", "TUBE", idAlu1, tpar, 3); + +// gMC->Gspos("S03I",1,"S03M", 0.,0.,-zfpos, 0,"ONLY"); +// gMC->Gspos("S03I",2,"S03M", 0.,0.,+zfpos, 0,"ONLY"); +// gMC->Gspos("S04I",1,"S04M", 0.,0.,-zfpos, 0,"ONLY"); +// gMC->Gspos("S04I",2,"S04M", 0.,0.,+zfpos, 0,"ONLY"); // // Frame Crosses - if (frames) { - - bpar[0] = (iChamber->ROuter() - iChamber->RInner())/2; - bpar[1] = dframep/2; - bpar[2] = dframez/2; - gMC->Gsvolu("C03B", "BOX", idAlu1, bpar, 3); - gMC->Gsvolu("C04B", "BOX", idAlu1, bpar, 3); + if (frameCrosses) { + // outside gas + // security for inside mother volume + bpar[0] = (iChamber->ROuter() - iChamber->RInner()) + * TMath::Cos(TMath::ASin(dframep1 / + (iChamber->ROuter() - iChamber->RInner()))) + / 2.0; + bpar[1] = dframep1/2; + // total thickness will be (4 * bpar[2]) for each chamber, + // which has to be equal to (2 * dframez) - DAlu + bpar[2] = (2.0 * dframez - iChamber->DAlu()) / 4.0; + gMC->Gsvolu("S03B", "BOX", idAlu1, bpar, 3); + gMC->Gsvolu("S04B", "BOX", idAlu1, bpar, 3); - gMC->Gspos("C03B",1,"C03M", +iChamber->RInner()+bpar[0] , 0,-zfpos, + gMC->Gspos("S03B",1,"S03M", +iChamber->RInner()+bpar[0] , 0,-zfpos, idrotm[1100],"ONLY"); - gMC->Gspos("C03B",2,"C03M", -iChamber->RInner()-bpar[0] , 0,-zfpos, + gMC->Gspos("S03B",2,"S03M", -iChamber->RInner()-bpar[0] , 0,-zfpos, idrotm[1100],"ONLY"); - gMC->Gspos("C03B",3,"C03M", 0, +iChamber->RInner()+bpar[0] ,-zfpos, + gMC->Gspos("S03B",3,"S03M", 0, +iChamber->RInner()+bpar[0] ,-zfpos, idrotm[1101],"ONLY"); - gMC->Gspos("C03B",4,"C03M", 0, -iChamber->RInner()-bpar[0] ,-zfpos, + gMC->Gspos("S03B",4,"S03M", 0, -iChamber->RInner()-bpar[0] ,-zfpos, idrotm[1101],"ONLY"); - gMC->Gspos("C03B",5,"C03M", +iChamber->RInner()+bpar[0] , 0,+zfpos, + gMC->Gspos("S03B",5,"S03M", +iChamber->RInner()+bpar[0] , 0,+zfpos, idrotm[1100],"ONLY"); - gMC->Gspos("C03B",6,"C03M", -iChamber->RInner()-bpar[0] , 0,+zfpos, + gMC->Gspos("S03B",6,"S03M", -iChamber->RInner()-bpar[0] , 0,+zfpos, idrotm[1100],"ONLY"); - gMC->Gspos("C03B",7,"C03M", 0, +iChamber->RInner()+bpar[0] ,+zfpos, + gMC->Gspos("S03B",7,"S03M", 0, +iChamber->RInner()+bpar[0] ,+zfpos, idrotm[1101],"ONLY"); - gMC->Gspos("C03B",8,"C03M", 0, -iChamber->RInner()-bpar[0] ,+zfpos, + gMC->Gspos("S03B",8,"S03M", 0, -iChamber->RInner()-bpar[0] ,+zfpos, idrotm[1101],"ONLY"); - gMC->Gspos("C04B",1,"C04M", +iChamber->RInner()+bpar[0] , 0,-zfpos, + gMC->Gspos("S04B",1,"S04M", +iChamber->RInner()+bpar[0] , 0,-zfpos, idrotm[1100],"ONLY"); - gMC->Gspos("C04B",2,"C04M", -iChamber->RInner()-bpar[0] , 0,-zfpos, + gMC->Gspos("S04B",2,"S04M", -iChamber->RInner()-bpar[0] , 0,-zfpos, idrotm[1100],"ONLY"); - gMC->Gspos("C04B",3,"C04M", 0, +iChamber->RInner()+bpar[0] ,-zfpos, + gMC->Gspos("S04B",3,"S04M", 0, +iChamber->RInner()+bpar[0] ,-zfpos, idrotm[1101],"ONLY"); - gMC->Gspos("C04B",4,"C04M", 0, -iChamber->RInner()-bpar[0] ,-zfpos, + gMC->Gspos("S04B",4,"S04M", 0, -iChamber->RInner()-bpar[0] ,-zfpos, idrotm[1101],"ONLY"); - gMC->Gspos("C04B",5,"C04M", +iChamber->RInner()+bpar[0] , 0,+zfpos, + gMC->Gspos("S04B",5,"S04M", +iChamber->RInner()+bpar[0] , 0,+zfpos, idrotm[1100],"ONLY"); - gMC->Gspos("C04B",6,"C04M", -iChamber->RInner()-bpar[0] , 0,+zfpos, + gMC->Gspos("S04B",6,"S04M", -iChamber->RInner()-bpar[0] , 0,+zfpos, idrotm[1100],"ONLY"); - gMC->Gspos("C04B",7,"C04M", 0, +iChamber->RInner()+bpar[0] ,+zfpos, + gMC->Gspos("S04B",7,"S04M", 0, +iChamber->RInner()+bpar[0] ,+zfpos, idrotm[1101],"ONLY"); - gMC->Gspos("C04B",8,"C04M", 0, -iChamber->RInner()-bpar[0] ,+zfpos, + gMC->Gspos("S04B",8,"S04M", 0, -iChamber->RInner()-bpar[0] ,+zfpos, idrotm[1101],"ONLY"); } // @@ -434,47 +525,48 @@ void AliMUONv1::CreateGeometry() tpar[0]= iChamber->RInner(); tpar[1]= iChamber->ROuter(); tpar[2] = (iChamber->DGas()+iChamber->DAlu())/2; - gMC->Gsvolu("C03A", "TUBE", idAlu2, tpar, 3); - gMC->Gsvolu("C04A", "TUBE", idAlu2, tpar, 3); - gMC->Gspos("C03A", 1, "C03M", 0., 0., 0., 0, "ONLY"); - gMC->Gspos("C04A", 1, "C04M", 0., 0., 0., 0, "ONLY"); + gMC->Gsvolu("S03A", "TUBE", idAlu2, tpar, 3); + gMC->Gsvolu("S04A", "TUBE", idAlu2, tpar, 3); + gMC->Gspos("S03A", 1, "S03M", 0., 0., 0., 0, "ONLY"); + gMC->Gspos("S04A", 1, "S04M", 0., 0., 0., 0, "ONLY"); // // Sensitive volumes // tpar[2] = iChamber->DGas(); tpar[2] = iChamber->DGas()/2; - gMC->Gsvolu("C03G", "TUBE", idGas, tpar, 3); - gMC->Gsvolu("C04G", "TUBE", idGas, tpar, 3); - gMC->Gspos("C03G", 1, "C03A", 0., 0., 0., 0, "ONLY"); - gMC->Gspos("C04G", 1, "C04A", 0., 0., 0., 0, "ONLY"); - - if (frames) { + gMC->Gsvolu("S03G", "TUBE", idGas, tpar, 3); + gMC->Gsvolu("S04G", "TUBE", idGas, tpar, 3); + gMC->Gspos("S03G", 1, "S03A", 0., 0., 0., 0, "ONLY"); + gMC->Gspos("S04G", 1, "S04A", 0., 0., 0., 0, "ONLY"); // // Frame Crosses to be placed inside gas - dr = (iChamber->ROuter() - iChamber->RInner()); - bpar[0] = TMath::Sqrt(dr*dr-dframep*dframep/4)/2; - bpar[1] = dframep/2; - bpar[2] = iChamber->DGas()/2; - gMC->Gsvolu("C03F", "BOX", idAlu1, bpar, 3); - gMC->Gsvolu("C04F", "BOX", idAlu1, bpar, 3); + // NONE: chambers are sensitive everywhere +// if (frameCrosses) { + +// dr = (iChamber->ROuter() - iChamber->RInner()); +// bpar[0] = TMath::Sqrt(dr*dr-dframep1*dframep1/4)/2; +// bpar[1] = dframep1/2; +// bpar[2] = iChamber->DGas()/2; +// gMC->Gsvolu("S03F", "BOX", idAlu1, bpar, 3); +// gMC->Gsvolu("S04F", "BOX", idAlu1, bpar, 3); - gMC->Gspos("C03F",1,"C03G", +iChamber->RInner()+bpar[0] , 0, 0, - idrotm[1100],"ONLY"); - gMC->Gspos("C03F",2,"C03G", -iChamber->RInner()-bpar[0] , 0, 0, - idrotm[1100],"ONLY"); - gMC->Gspos("C03F",3,"C03G", 0, +iChamber->RInner()+bpar[0] , 0, - idrotm[1101],"ONLY"); - gMC->Gspos("C03F",4,"C03G", 0, -iChamber->RInner()-bpar[0] , 0, - idrotm[1101],"ONLY"); +// gMC->Gspos("S03F",1,"S03G", +iChamber->RInner()+bpar[0] , 0, 0, +// idrotm[1100],"ONLY"); +// gMC->Gspos("S03F",2,"S03G", -iChamber->RInner()-bpar[0] , 0, 0, +// idrotm[1100],"ONLY"); +// gMC->Gspos("S03F",3,"S03G", 0, +iChamber->RInner()+bpar[0] , 0, +// idrotm[1101],"ONLY"); +// gMC->Gspos("S03F",4,"S03G", 0, -iChamber->RInner()-bpar[0] , 0, +// idrotm[1101],"ONLY"); - gMC->Gspos("C04F",1,"C04G", +iChamber->RInner()+bpar[0] , 0, 0, - idrotm[1100],"ONLY"); - gMC->Gspos("C04F",2,"C04G", -iChamber->RInner()-bpar[0] , 0, 0, - idrotm[1100],"ONLY"); - gMC->Gspos("C04F",3,"C04G", 0, +iChamber->RInner()+bpar[0] , 0, - idrotm[1101],"ONLY"); - gMC->Gspos("C04F",4,"C04G", 0, -iChamber->RInner()-bpar[0] , 0, - idrotm[1101],"ONLY"); - } +// gMC->Gspos("S04F",1,"S04G", +iChamber->RInner()+bpar[0] , 0, 0, +// idrotm[1100],"ONLY"); +// gMC->Gspos("S04F",2,"S04G", -iChamber->RInner()-bpar[0] , 0, 0, +// idrotm[1100],"ONLY"); +// gMC->Gspos("S04F",3,"S04G", 0, +iChamber->RInner()+bpar[0] , 0, +// idrotm[1101],"ONLY"); +// gMC->Gspos("S04F",4,"S04G", 0, -iChamber->RInner()-bpar[0] , 0, +// idrotm[1101],"ONLY"); +// } } // define the id of tracking media: Int_t idCopper = idtmed[1110]; @@ -583,17 +675,32 @@ void AliMUONv1::CreateGeometry() zpos2=iChamber2->Z(); dstation = zpos2 - zpos1; - zfpos=-(iChamber->DGas()+dframez+iChamber->DAlu())/2; +// zfpos=-(iChamber->DGas()+dframez+iChamber->DAlu())/2; // not used any more // // Mother volume tpar[0] = iChamber->RInner()-dframep; tpar[1] = (iChamber->ROuter()+dframep)/TMath::Cos(phi); - tpar[2] = dstation/4; - gMC->Gsvolu("C05M", "TUBE", idAir, tpar, 3); - gMC->Gsvolu("C06M", "TUBE", idAir, tpar, 3); - gMC->Gspos("C05M", 1, "ALIC", 0., 0., zpos1 , 0, "ONLY"); - gMC->Gspos("C06M", 1, "ALIC", 0., 0., zpos2 , 0, "ONLY"); - + tpar[2] = dstation/5; + + char *slats5Mother = "S05M"; + char *slats6Mother = "S06M"; + Float_t zoffs5 = 0; + Float_t zoffs6 = 0; + + if (gAlice->GetModule("DIPO")) { + slats5Mother="DDIP"; + slats6Mother="DDIP"; + + zoffs5 = zpos1; + zoffs6 = zpos2; + } + else { + gMC->Gsvolu("S05M", "TUBE", idAir, tpar, 3); + gMC->Gsvolu("S06M", "TUBE", idAir, tpar, 3); + gMC->Gspos("S05M", 1, "ALIC", 0., 0., zpos1 , 0, "ONLY"); + gMC->Gspos("S06M", 1, "ALIC", 0., 0., zpos2 , 0, "ONLY"); + } + // volumes for slat geometry (xx=5,..,10 chamber id): // Sxx0 Sxx1 Sxx2 Sxx3 --> Slat Mother volumes // SxxG --> Sensitive volume (gas) @@ -602,12 +709,23 @@ void AliMUONv1::CreateGeometry() // SxxC --> Carbon panel // SxxR --> Rohacell // SxxH, SxxV --> Horizontal and Vertical frames (vetronite) - + // SB5x --> Volumes for the 35 cm long PCB // slat dimensions: slat is a MOTHER volume!!! made of air + // only for chamber 5: slat 1 has a PCB shorter by 5cm! + + Float_t tlength = 35.; + Float_t panelpar2[3] = { tlength/2., panelpar[1], panelpar[2]}; + Float_t rohapar2[3] = { tlength/2., rohapar[1], rohapar[2]}; + Float_t insupar2[3] = { tlength/2., insupar[1], insupar[2]}; + Float_t pcbpar2[3] = { tlength/2., pcbpar[1], pcbpar[2]}; + Float_t senspar2[3] = { tlength/2., senspar[1], senspar[2]}; + Float_t hFramepar2[3] = { tlength/2., hFramepar[1], hFramepar[2]}; + Float_t bFramepar2[3] = { tlength/2., bFramepar[1], bFramepar[2]}; + const Int_t nSlats3 = 5; // number of slats per quadrant const Int_t nPCB3[nSlats3] = {3,3,4,3,2}; // n PCB per slat - const Float_t xpos3[nSlats3] = {30., 40., 0., 0., 0.}; + const Float_t xpos3[nSlats3] = {31., 40., 0., 0., 0.}; Float_t slatLength3[nSlats3]; // create and position the slat (mother) volumes @@ -616,59 +734,77 @@ void AliMUONv1::CreateGeometry() char volNam6[5]; Float_t xSlat3; + Float_t spar2[3]; for (i = 0; iGsvolu(volNam5,"BOX",slatMaterial,spar,3); - gMC->Gspos(volNam5, i*4+1,"C05M", xSlat3, ySlat31, zSlat+2.*dzCh3, 0, "ONLY"); - gMC->Gspos(volNam5, i*4+2,"C05M",-xSlat3, ySlat31, zSlat-2.*dzCh3, 0, "ONLY"); + gMC->Gsvolu(volNam5,"BOX",slatMaterial,spar2,3); + gMC->Gspos(volNam5, i*4+1,slats5Mother, xSlat32, ySlat31, zoffs5+zSlat+2.*dzCh3, 0, "ONLY"); + gMC->Gspos(volNam5, i*4+2,slats5Mother,-xSlat32, ySlat31, zoffs5+zSlat-2.*dzCh3, 0, "ONLY"); + if (i>0) { - gMC->Gspos(volNam5, i*4+3,"C05M", xSlat3, ySlat32, zSlat+2.*dzCh3, 0, "ONLY"); - gMC->Gspos(volNam5, i*4+4,"C05M",-xSlat3, ySlat32, zSlat-2.*dzCh3, 0, "ONLY"); + gMC->Gspos(volNam5, i*4+3,slats5Mother, xSlat32, ySlat32, zoffs5+zSlat+2.*dzCh3, 0, "ONLY"); + gMC->Gspos(volNam5, i*4+4,slats5Mother,-xSlat32, ySlat32, zoffs5+zSlat-2.*dzCh3, 0, "ONLY"); } sprintf(volNam6,"S06%d",i); gMC->Gsvolu(volNam6,"BOX",slatMaterial,spar,3); - gMC->Gspos(volNam6, i*4+1,"C06M", xSlat3, ySlat31, zSlat+2.*dzCh3, 0, "ONLY"); - gMC->Gspos(volNam6, i*4+2,"C06M",-xSlat3, ySlat31, zSlat-2.*dzCh3, 0, "ONLY"); + gMC->Gspos(volNam6, i*4+1,slats6Mother, xSlat3, ySlat31, zoffs6+zSlat+2.*dzCh3, 0, "ONLY"); + gMC->Gspos(volNam6, i*4+2,slats6Mother,-xSlat3, ySlat31, zoffs6+zSlat-2.*dzCh3, 0, "ONLY"); if (i>0) { - gMC->Gspos(volNam6, i*4+3,"C06M", xSlat3, ySlat32, zSlat+2.*dzCh3, 0, "ONLY"); - gMC->Gspos(volNam6, i*4+4,"C06M",-xSlat3, ySlat32, zSlat-2.*dzCh3, 0, "ONLY"); + gMC->Gspos(volNam6, i*4+3,slats6Mother, xSlat3, ySlat32, zoffs6+zSlat+2.*dzCh3, 0, "ONLY"); + gMC->Gspos(volNam6, i*4+4,slats6Mother,-xSlat3, ySlat32, zoffs6+zSlat-2.*dzCh3, 0, "ONLY"); } } // create the panel volume gMC->Gsvolu("S05C","BOX",panelMaterial,panelpar,3); + gMC->Gsvolu("SB5C","BOX",panelMaterial,panelpar2,3); gMC->Gsvolu("S06C","BOX",panelMaterial,panelpar,3); // create the rohacell volume gMC->Gsvolu("S05R","BOX",rohaMaterial,rohapar,3); + gMC->Gsvolu("SB5R","BOX",rohaMaterial,rohapar2,3); gMC->Gsvolu("S06R","BOX",rohaMaterial,rohapar,3); // create the insulating material volume gMC->Gsvolu("S05I","BOX",insuMaterial,insupar,3); + gMC->Gsvolu("SB5I","BOX",insuMaterial,insupar2,3); gMC->Gsvolu("S06I","BOX",insuMaterial,insupar,3); // create the PCB volume gMC->Gsvolu("S05P","BOX",pcbMaterial,pcbpar,3); + gMC->Gsvolu("SB5P","BOX",pcbMaterial,pcbpar2,3); gMC->Gsvolu("S06P","BOX",pcbMaterial,pcbpar,3); // create the sensitive volumes, - gMC->Gsvolu("S05G","BOX",sensMaterial,0,0); - gMC->Gsvolu("S06G","BOX",sensMaterial,0,0); + gMC->Gsvolu("S05G","BOX",sensMaterial,dum,0); + gMC->Gsvolu("S06G","BOX",sensMaterial,dum,0); // create the vertical frame volume @@ -679,11 +815,13 @@ void AliMUONv1::CreateGeometry() // create the horizontal frame volume gMC->Gsvolu("S05H","BOX",hFrameMaterial,hFramepar,3); + gMC->Gsvolu("SB5H","BOX",hFrameMaterial,hFramepar2,3); gMC->Gsvolu("S06H","BOX",hFrameMaterial,hFramepar,3); // create the horizontal border volume gMC->Gsvolu("S05B","BOX",bFrameMaterial,bFramepar,3); + gMC->Gsvolu("SB5B","BOX",bFrameMaterial,bFramepar2,3); gMC->Gsvolu("S06B","BOX",bFrameMaterial,bFramepar,3); index=0; @@ -691,10 +829,12 @@ void AliMUONv1::CreateGeometry() sprintf(volNam5,"S05%d",i); sprintf(volNam6,"S06%d",i); Float_t xvFrame = (slatLength3[i] - vFrameLength)/2.; + Float_t xvFrame2 = xvFrame; + if ( i==1 || i ==2 ) xvFrame2 -= 5./2.; // position the vertical frames - if (i!=1) { - gMC->Gspos("S05V",2*i-1,volNam5, xvFrame, 0., 0. , 0, "ONLY"); - gMC->Gspos("S05V",2*i ,volNam5,-xvFrame, 0., 0. , 0, "ONLY"); + if (i!=1 && i!=0) { + gMC->Gspos("S05V",2*i-1,volNam5, xvFrame2, 0., 0. , 0, "ONLY"); + gMC->Gspos("S05V",2*i ,volNam5,-xvFrame2, 0., 0. , 0, "ONLY"); gMC->Gspos("S06V",2*i-1,volNam6, xvFrame, 0., 0. , 0, "ONLY"); gMC->Gspos("S06V",2*i ,volNam6,-xvFrame, 0., 0. , 0, "ONLY"); } @@ -702,35 +842,53 @@ void AliMUONv1::CreateGeometry() for (j=0; jGspos("S05C",2*index-1,volNam5, xx, 0., zPanel , 0, "ONLY"); - gMC->Gspos("S05C",2*index ,volNam5, xx, 0.,-zPanel , 0, "ONLY"); + if ( (i==1 || i==2) && j == nPCB3[i]-1) { // 1 pcb is shortened by 5cm + gMC->Gspos("SB5C",2*index-1,volNam5, xx, 0., zPanel , 0, "ONLY"); + gMC->Gspos("SB5C",2*index ,volNam5, xx, 0.,-zPanel , 0, "ONLY"); + gMC->Gspos("SB5I",index ,volNam5, xx, 0., 0 , 0, "ONLY"); + } + else if ( (i==1 || i==2) && j < nPCB3[i]-1) { + gMC->Gspos("S05C",2*index-1,volNam5, xx2, 0., zPanel , 0, "ONLY"); + gMC->Gspos("S05C",2*index ,volNam5, xx2, 0.,-zPanel , 0, "ONLY"); + gMC->Gspos("S05I",index ,volNam5, xx2, 0., 0 , 0, "ONLY"); + } + else { + gMC->Gspos("S05C",2*index-1,volNam5, xx, 0., zPanel , 0, "ONLY"); + gMC->Gspos("S05C",2*index ,volNam5, xx, 0.,-zPanel , 0, "ONLY"); + gMC->Gspos("S05I",index ,volNam5, xx, 0., 0 , 0, "ONLY"); + } gMC->Gspos("S06C",2*index-1,volNam6, xx, 0., zPanel , 0, "ONLY"); gMC->Gspos("S06C",2*index ,volNam6, xx, 0.,-zPanel , 0, "ONLY"); - - gMC->Gspos("S05I",index,volNam5, xx, 0., 0 , 0, "ONLY"); gMC->Gspos("S06I",index,volNam6, xx, 0., 0 , 0, "ONLY"); } } - + // position the rohacell volume inside the panel volume gMC->Gspos("S05R",1,"S05C",0.,0.,0.,0,"ONLY"); + gMC->Gspos("SB5R",1,"SB5C",0.,0.,0.,0,"ONLY"); gMC->Gspos("S06R",1,"S06C",0.,0.,0.,0,"ONLY"); // position the PCB volume inside the insulating material volume gMC->Gspos("S05P",1,"S05I",0.,0.,0.,0,"ONLY"); + gMC->Gspos("SB5P",1,"SB5I",0.,0.,0.,0,"ONLY"); gMC->Gspos("S06P",1,"S06I",0.,0.,0.,0,"ONLY"); // position the horizontal frame volume inside the PCB volume gMC->Gspos("S05H",1,"S05P",0.,0.,0.,0,"ONLY"); + gMC->Gspos("SB5H",1,"SB5P",0.,0.,0.,0,"ONLY"); gMC->Gspos("S06H",1,"S06P",0.,0.,0.,0,"ONLY"); // position the sensitive volume inside the horizontal frame volume gMC->Gsposp("S05G",1,"S05H",0.,0.,0.,0,"ONLY",senspar,3); + gMC->Gsposp("S05G",1,"SB5H",0.,0.,0.,0,"ONLY",senspar2,3); gMC->Gsposp("S06G",1,"S06H",0.,0.,0.,0,"ONLY",senspar,3); // position the border volumes inside the PCB volume Float_t yborder = ( pcbHeight - bFrameHeight ) / 2.; gMC->Gspos("S05B",1,"S05P",0., yborder,0.,0,"ONLY"); gMC->Gspos("S05B",2,"S05P",0.,-yborder,0.,0,"ONLY"); + gMC->Gspos("SB5B",1,"SB5P",0., yborder,0.,0,"ONLY"); + gMC->Gspos("SB5B",2,"SB5P",0.,-yborder,0.,0,"ONLY"); gMC->Gspos("S06B",1,"S06P",0., yborder,0.,0,"ONLY"); gMC->Gspos("S06B",2,"S06P",0.,-yborder,0.,0,"ONLY"); @@ -739,10 +897,15 @@ void AliMUONv1::CreateGeometry() gMC->Gsvolu("S05N","BOX",nulocMaterial,nulocpar,3); gMC->Gsvolu("S06N","BOX",nulocMaterial,nulocpar,3); index = 0; - for (xx = -xxmax; xx<=xxmax; xx+=3*nulocLength) { + Float_t xxmax2 = xxmax - 5./2.; + for (xx = -xxmax; xx<=xxmax; xx+=2*nulocLength) { index++; gMC->Gspos("S05N",2*index-1,"S05B", xx, 0.,-bFrameWidth/4., 0, "ONLY"); gMC->Gspos("S05N",2*index ,"S05B", xx, 0., bFrameWidth/4., 0, "ONLY"); + if (xx > -xxmax2 && xx< xxmax2) { + gMC->Gspos("S05N",2*index-1,"SB5B", xx, 0.,-bFrameWidth/4., 0, "ONLY"); + gMC->Gspos("S05N",2*index ,"SB5B", xx, 0., bFrameWidth/4., 0, "ONLY"); + } gMC->Gspos("S06N",2*index-1,"S06B", xx, 0.,-bFrameWidth/4., 0, "ONLY"); gMC->Gspos("S06N",2*index ,"S06B", xx, 0., bFrameWidth/4., 0, "ONLY"); } @@ -753,33 +916,32 @@ void AliMUONv1::CreateGeometry() Int_t ndiv=6; Float_t divpar[3]; Double_t dydiv= sensHeight/ndiv; - Double_t ydiv = yoffs -dydiv - yOverlap/2.; + Double_t ydiv = yoffs -dydiv; Int_t imax=0; - // for (Int_t islat=0; islatGsposp("S05G",imax+4*idiv+1,"C05M", xvol, yvol, z1+z2, 0, "ONLY",divpar,3); - gMC->Gsposp("S06G",imax+4*idiv+1,"C06M", xvol, yvol, z1+z2, 0, "ONLY",divpar,3); - gMC->Gsposp("S05G",imax+4*idiv+2,"C05M", xvol,-yvol, z1+z2, 0, "ONLY",divpar,3); - gMC->Gsposp("S06G",imax+4*idiv+2,"C06M", xvol,-yvol, z1+z2, 0, "ONLY",divpar,3); - gMC->Gsposp("S05G",imax+4*idiv+3,"C05M",-xvol, yvol, z1-z2, 0, "ONLY",divpar,3); - gMC->Gsposp("S06G",imax+4*idiv+3,"C06M",-xvol, yvol, z1-z2, 0, "ONLY",divpar,3); - gMC->Gsposp("S05G",imax+4*idiv+4,"C05M",-xvol,-yvol, z1-z2, 0, "ONLY",divpar,3); - gMC->Gsposp("S06G",imax+4*idiv+4,"C06M",-xvol,-yvol, z1-z2, 0, "ONLY",divpar,3); + //printf ("y ll = %f y ur = %f \n",yvol - divpar[1], yvol + divpar[1]); + gMC->Gsposp("S05G",imax+4*idiv+1,slats5Mother, xvol, yvol, zoffs5+z1+z2, 0, "ONLY",divpar,3); + gMC->Gsposp("S06G",imax+4*idiv+1,slats6Mother, xvol, yvol, zoffs6+z1+z2, 0, "ONLY",divpar,3); + gMC->Gsposp("S05G",imax+4*idiv+2,slats5Mother, xvol,-yvol, zoffs5+z1+z2, 0, "ONLY",divpar,3); + gMC->Gsposp("S06G",imax+4*idiv+2,slats6Mother, xvol,-yvol, zoffs6+z1+z2, 0, "ONLY",divpar,3); + gMC->Gsposp("S05G",imax+4*idiv+3,slats5Mother,-xvol, yvol, zoffs5+z1-z2, 0, "ONLY",divpar,3); + gMC->Gsposp("S06G",imax+4*idiv+3,slats6Mother,-xvol, yvol, zoffs6+z1-z2, 0, "ONLY",divpar,3); + gMC->Gsposp("S05G",imax+4*idiv+4,slats5Mother,-xvol,-yvol, zoffs5+z1-z2, 0, "ONLY",divpar,3); + gMC->Gsposp("S06G",imax+4*idiv+4,slats6Mother,-xvol,-yvol, zoffs6+z1-z2, 0, "ONLY",divpar,3); } } - if (stations[3]) { //******************************************************************** @@ -793,23 +955,23 @@ void AliMUONv1::CreateGeometry() zpos1=iChamber1->Z(); zpos2=iChamber2->Z(); dstation = zpos2 - zpos1; - zfpos=-(iChamber->DGas()+dframez+iChamber->DAlu())/2; +// zfpos=-(iChamber->DGas()+dframez+iChamber->DAlu())/2; // not used any more // // Mother volume tpar[0] = iChamber->RInner()-dframep; tpar[1] = (iChamber->ROuter()+dframep)/TMath::Cos(phi); - tpar[2] = 3.252; + tpar[2] = dstation/4; - gMC->Gsvolu("C07M", "TUBE", idAir, tpar, 3); - gMC->Gsvolu("C08M", "TUBE", idAir, tpar, 3); - gMC->Gspos("C07M", 1, "ALIC", 0., 0., zpos1 , 0, "ONLY"); - gMC->Gspos("C08M", 1, "ALIC", 0., 0., zpos2 , 0, "ONLY"); + gMC->Gsvolu("S07M", "TUBE", idAir, tpar, 3); + gMC->Gsvolu("S08M", "TUBE", idAir, tpar, 3); + gMC->Gspos("S07M", 1, "ALIC", 0., 0., zpos1 , 0, "ONLY"); + gMC->Gspos("S08M", 1, "ALIC", 0., 0., zpos2 , 0, "ONLY"); const Int_t nSlats4 = 6; // number of slats per quadrant - const Int_t nPCB4[nSlats4] = {4,4,5,4,4,3}; // n PCB per slat - const Float_t xpos4[nSlats4] = {37.5, 40., 0., 0., 0., 0.}; + const Int_t nPCB4[nSlats4] = {4,4,5,5,4,3}; // n PCB per slat + const Float_t xpos4[nSlats4] = {38.5, 40., 0., 0., 0., 0.}; Float_t slatLength4[nSlats4]; // create and position the slat (mother) volumes @@ -833,19 +995,19 @@ void AliMUONv1::CreateGeometry() Float_t zSlat = (i%2 ==0)? spar[2] : -spar[2]; sprintf(volNam7,"S07%d",i); gMC->Gsvolu(volNam7,"BOX",slatMaterial,spar,3); - gMC->Gspos(volNam7, i*4+1,"C07M", xSlat4, ySlat4, zSlat+2.*dzCh4, 0, "ONLY"); - gMC->Gspos(volNam7, i*4+2,"C07M",-xSlat4, ySlat4, zSlat-2.*dzCh4, 0, "ONLY"); + gMC->Gspos(volNam7, i*4+1,"S07M", xSlat4, ySlat4, zSlat+2.*dzCh4, 0, "ONLY"); + gMC->Gspos(volNam7, i*4+2,"S07M",-xSlat4, ySlat4, zSlat-2.*dzCh4, 0, "ONLY"); if (i>0) { - gMC->Gspos(volNam7, i*4+3,"C07M", xSlat4,-ySlat4, zSlat+2.*dzCh4, 0, "ONLY"); - gMC->Gspos(volNam7, i*4+4,"C07M",-xSlat4,-ySlat4, zSlat-2.*dzCh4, 0, "ONLY"); + gMC->Gspos(volNam7, i*4+3,"S07M", xSlat4,-ySlat4, zSlat+2.*dzCh4, 0, "ONLY"); + gMC->Gspos(volNam7, i*4+4,"S07M",-xSlat4,-ySlat4, zSlat-2.*dzCh4, 0, "ONLY"); } sprintf(volNam8,"S08%d",i); gMC->Gsvolu(volNam8,"BOX",slatMaterial,spar,3); - gMC->Gspos(volNam8, i*4+1,"C08M", xSlat4, ySlat4, zSlat+2.*dzCh4, 0, "ONLY"); - gMC->Gspos(volNam8, i*4+2,"C08M",-xSlat4, ySlat4, zSlat-2.*dzCh4, 0, "ONLY"); + gMC->Gspos(volNam8, i*4+1,"S08M", xSlat4, ySlat4, zSlat+2.*dzCh4, 0, "ONLY"); + gMC->Gspos(volNam8, i*4+2,"S08M",-xSlat4, ySlat4, zSlat-2.*dzCh4, 0, "ONLY"); if (i>0) { - gMC->Gspos(volNam8, i*4+3,"C08M", xSlat4,-ySlat4, zSlat+2.*dzCh4, 0, "ONLY"); - gMC->Gspos(volNam8, i*4+4,"C08M",-xSlat4,-ySlat4, zSlat-2.*dzCh4, 0, "ONLY"); + gMC->Gspos(volNam8, i*4+3,"S08M", xSlat4,-ySlat4, zSlat+2.*dzCh4, 0, "ONLY"); + gMC->Gspos(volNam8, i*4+4,"S08M",-xSlat4,-ySlat4, zSlat-2.*dzCh4, 0, "ONLY"); } } @@ -872,8 +1034,8 @@ void AliMUONv1::CreateGeometry() // create the sensitive volumes, - gMC->Gsvolu("S07G","BOX",sensMaterial,0,0); - gMC->Gsvolu("S08G","BOX",sensMaterial,0,0); + gMC->Gsvolu("S07G","BOX",sensMaterial,dum,0); + gMC->Gsvolu("S08G","BOX",sensMaterial,dum,0); // create the vertical frame volume @@ -896,7 +1058,7 @@ void AliMUONv1::CreateGeometry() sprintf(volNam8,"S08%d",i); Float_t xvFrame = (slatLength4[i] - vFrameLength)/2.; // position the vertical frames - if (i!=1) { + if (i!=1 && i!=0) { gMC->Gspos("S07V",2*i-1,volNam7, xvFrame, 0., 0. , 0, "ONLY"); gMC->Gspos("S07V",2*i ,volNam7,-xvFrame, 0., 0. , 0, "ONLY"); gMC->Gspos("S08V",2*i-1,volNam8, xvFrame, 0., 0. , 0, "ONLY"); @@ -943,7 +1105,7 @@ void AliMUONv1::CreateGeometry() gMC->Gsvolu("S07N","BOX",nulocMaterial,nulocpar,3); gMC->Gsvolu("S08N","BOX",nulocMaterial,nulocpar,3); index = 0; - for (xx = -xxmax; xx<=xxmax; xx+=3*nulocLength) { + for (xx = -xxmax; xx<=xxmax; xx+=2*nulocLength) { index++; gMC->Gspos("S07N",2*index-1,"S07B", xx, 0.,-bFrameWidth/4., 0, "ONLY"); gMC->Gspos("S07N",2*index ,"S07B", xx, 0., bFrameWidth/4., 0, "ONLY"); @@ -952,34 +1114,33 @@ void AliMUONv1::CreateGeometry() } // position the volumes approximating the circular section of the pipe - Float_t yoffs = sensHeight/2. - yOverlap/2.; + Float_t yoffs = sensHeight/2. - yOverlap; Float_t epsilon = 0.001; Int_t ndiv=6; Float_t divpar[3]; Double_t dydiv= sensHeight/ndiv; - Double_t ydiv = yoffs -dydiv - yOverlap/2.; + Double_t ydiv = yoffs -dydiv; Int_t imax=0; - // for (Int_t islat=0; islatGsposp("S07G",imax+4*idiv+1,"C07M", xvol, yvol, z1+z2, 0, "ONLY",divpar,3); - gMC->Gsposp("S08G",imax+4*idiv+1,"C08M", xvol, yvol, z1+z2, 0, "ONLY",divpar,3); - gMC->Gsposp("S07G",imax+4*idiv+2,"C07M", xvol,-yvol, z1+z2, 0, "ONLY",divpar,3); - gMC->Gsposp("S08G",imax+4*idiv+2,"C08M", xvol,-yvol, z1+z2, 0, "ONLY",divpar,3); - gMC->Gsposp("S07G",imax+4*idiv+3,"C07M",-xvol, yvol, z1-z2, 0, "ONLY",divpar,3); - gMC->Gsposp("S08G",imax+4*idiv+3,"C08M",-xvol, yvol, z1-z2, 0, "ONLY",divpar,3); - gMC->Gsposp("S07G",imax+4*idiv+4,"C07M",-xvol,-yvol, z1-z2, 0, "ONLY",divpar,3); - gMC->Gsposp("S08G",imax+4*idiv+4,"C08M",-xvol,-yvol, z1-z2, 0, "ONLY",divpar,3); + gMC->Gsposp("S07G",imax+4*idiv+1,"S07M", xvol, yvol, z1+z2, 0, "ONLY",divpar,3); + gMC->Gsposp("S08G",imax+4*idiv+1,"S08M", xvol, yvol, z1+z2, 0, "ONLY",divpar,3); + gMC->Gsposp("S07G",imax+4*idiv+2,"S07M", xvol,-yvol, z1+z2, 0, "ONLY",divpar,3); + gMC->Gsposp("S08G",imax+4*idiv+2,"S08M", xvol,-yvol, z1+z2, 0, "ONLY",divpar,3); + gMC->Gsposp("S07G",imax+4*idiv+3,"S07M",-xvol, yvol, z1-z2, 0, "ONLY",divpar,3); + gMC->Gsposp("S08G",imax+4*idiv+3,"S08M",-xvol, yvol, z1-z2, 0, "ONLY",divpar,3); + gMC->Gsposp("S07G",imax+4*idiv+4,"S07M",-xvol,-yvol, z1-z2, 0, "ONLY",divpar,3); + gMC->Gsposp("S08G",imax+4*idiv+4,"S08M",-xvol,-yvol, z1-z2, 0, "ONLY",divpar,3); } @@ -1002,7 +1163,7 @@ void AliMUONv1::CreateGeometry() zpos1=iChamber1->Z(); zpos2=iChamber2->Z(); dstation = zpos2 - zpos1; - zfpos=-(iChamber->DGas()+dframez+iChamber->DAlu())/2; +// zfpos=-(iChamber->DGas()+dframez+iChamber->DAlu())/2; // not used any more // // Mother volume @@ -1010,15 +1171,15 @@ void AliMUONv1::CreateGeometry() tpar[1] = (iChamber->ROuter()+dframep)/TMath::Cos(phi); tpar[2] = dstation/5.; - gMC->Gsvolu("C09M", "TUBE", idAir, tpar, 3); - gMC->Gsvolu("C10M", "TUBE", idAir, tpar, 3); - gMC->Gspos("C09M", 1, "ALIC", 0., 0., zpos1 , 0, "ONLY"); - gMC->Gspos("C10M", 1, "ALIC", 0., 0., zpos2 , 0, "ONLY"); + gMC->Gsvolu("S09M", "TUBE", idAir, tpar, 3); + gMC->Gsvolu("S10M", "TUBE", idAir, tpar, 3); + gMC->Gspos("S09M", 1, "ALIC", 0., 0., zpos1 , 0, "ONLY"); + gMC->Gspos("S10M", 1, "ALIC", 0., 0., zpos2 , 0, "ONLY"); const Int_t nSlats5 = 7; // number of slats per quadrant const Int_t nPCB5[nSlats5] = {5,5,6,6,5,4,3}; // n PCB per slat - const Float_t xpos5[nSlats5] = {37.5, 40., 0., 0., 0., 0., 0.}; + const Float_t xpos5[nSlats5] = {38.5, 40., 0., 0., 0., 0., 0.}; Float_t slatLength5[nSlats5]; char volNam9[5]; char volNam10[5]; @@ -1028,7 +1189,7 @@ void AliMUONv1::CreateGeometry() for (i = 0; iGsvolu(volNam9,"BOX",slatMaterial,spar,3); - gMC->Gspos(volNam9, i*4+1,"C09M", xSlat5, ySlat5, zSlat+2.*dzCh5, 0, "ONLY"); - gMC->Gspos(volNam9, i*4+2,"C09M",-xSlat5, ySlat5, zSlat-2.*dzCh5, 0, "ONLY"); + gMC->Gspos(volNam9, i*4+1,"S09M", xSlat5, ySlat5, zSlat+2.*dzCh5, 0, "ONLY"); + gMC->Gspos(volNam9, i*4+2,"S09M",-xSlat5, ySlat5, zSlat-2.*dzCh5, 0, "ONLY"); if (i>0) { - gMC->Gspos(volNam9, i*4+3,"C09M", xSlat5,-ySlat5, zSlat+2.*dzCh5, 0, "ONLY"); - gMC->Gspos(volNam9, i*4+4,"C09M",-xSlat5,-ySlat5, zSlat-2.*dzCh5, 0, "ONLY"); + gMC->Gspos(volNam9, i*4+3,"S09M", xSlat5,-ySlat5, zSlat+2.*dzCh5, 0, "ONLY"); + gMC->Gspos(volNam9, i*4+4,"S09M",-xSlat5,-ySlat5, zSlat-2.*dzCh5, 0, "ONLY"); } sprintf(volNam10,"S10%d",i); gMC->Gsvolu(volNam10,"BOX",slatMaterial,spar,3); - gMC->Gspos(volNam10, i*4+1,"C10M", xSlat5, ySlat5, zSlat+2.*dzCh5, 0, "ONLY"); - gMC->Gspos(volNam10, i*4+2,"C10M",-xSlat5, ySlat5, zSlat-2.*dzCh5, 0, "ONLY"); + gMC->Gspos(volNam10, i*4+1,"S10M", xSlat5, ySlat5, zSlat+2.*dzCh5, 0, "ONLY"); + gMC->Gspos(volNam10, i*4+2,"S10M",-xSlat5, ySlat5, zSlat-2.*dzCh5, 0, "ONLY"); if (i>0) { - gMC->Gspos(volNam10, i*4+3,"C10M", xSlat5,-ySlat5, zSlat+2.*dzCh5, 0, "ONLY"); - gMC->Gspos(volNam10, i*4+4,"C10M",-xSlat5,-ySlat5, zSlat-2.*dzCh5, 0, "ONLY"); + gMC->Gspos(volNam10, i*4+3,"S10M", xSlat5,-ySlat5, zSlat+2.*dzCh5, 0, "ONLY"); + gMC->Gspos(volNam10, i*4+4,"S10M",-xSlat5,-ySlat5, zSlat-2.*dzCh5, 0, "ONLY"); } } @@ -1076,8 +1237,8 @@ void AliMUONv1::CreateGeometry() // create the sensitive volumes, - gMC->Gsvolu("S09G","BOX",sensMaterial,0,0); - gMC->Gsvolu("S10G","BOX",sensMaterial,0,0); + gMC->Gsvolu("S09G","BOX",sensMaterial,dum,0); + gMC->Gsvolu("S10G","BOX",sensMaterial,dum,0); // create the vertical frame volume @@ -1100,7 +1261,7 @@ void AliMUONv1::CreateGeometry() sprintf(volNam10,"S10%d",i); Float_t xvFrame = (slatLength5[i] - vFrameLength)/2.; // position the vertical frames - if (i!=1) { + if (i!=1 && i!=0) { gMC->Gspos("S09V",2*i-1,volNam9, xvFrame, 0., 0. , 0, "ONLY"); gMC->Gspos("S09V",2*i ,volNam9,-xvFrame, 0., 0. , 0, "ONLY"); gMC->Gspos("S10V",2*i-1,volNam10, xvFrame, 0., 0. , 0, "ONLY"); @@ -1148,7 +1309,7 @@ void AliMUONv1::CreateGeometry() gMC->Gsvolu("S09N","BOX",nulocMaterial,nulocpar,3); gMC->Gsvolu("S10N","BOX",nulocMaterial,nulocpar,3); index = 0; - for (xx = -xxmax; xx<=xxmax; xx+=3*nulocLength) { + for (xx = -xxmax; xx<=xxmax; xx+=2*nulocLength) { index++; gMC->Gspos("S09N",2*index-1,"S09B", xx, 0.,-bFrameWidth/4., 0, "ONLY"); gMC->Gspos("S09N",2*index ,"S09B", xx, 0., bFrameWidth/4., 0, "ONLY"); @@ -1156,12 +1317,12 @@ void AliMUONv1::CreateGeometry() gMC->Gspos("S10N",2*index ,"S10B", xx, 0., bFrameWidth/4., 0, "ONLY"); } // position the volumes approximating the circular section of the pipe - Float_t yoffs = sensHeight/2. - yOverlap/2.; + Float_t yoffs = sensHeight/2. - yOverlap; Float_t epsilon = 0.001; Int_t ndiv=6; Float_t divpar[3]; Double_t dydiv= sensHeight/ndiv; - Double_t ydiv = yoffs -dydiv - yOverlap/2.; + Double_t ydiv = yoffs -dydiv; Int_t imax=0; // for (Int_t islat=0; islatGsposp("S09G",imax+4*idiv+1,"C09M", xvol, yvol, z1+z2, 0, "ONLY",divpar,3); - gMC->Gsposp("S10G",imax+4*idiv+1,"C10M", xvol, yvol, z1+z2, 0, "ONLY",divpar,3); - gMC->Gsposp("S09G",imax+4*idiv+2,"C09M", xvol,-yvol, z1+z2, 0, "ONLY",divpar,3); - gMC->Gsposp("S10G",imax+4*idiv+2,"C10M", xvol,-yvol, z1+z2, 0, "ONLY",divpar,3); - gMC->Gsposp("S09G",imax+4*idiv+3,"C09M",-xvol, yvol, z1-z2, 0, "ONLY",divpar,3); - gMC->Gsposp("S10G",imax+4*idiv+3,"C10M",-xvol, yvol, z1-z2, 0, "ONLY",divpar,3); - gMC->Gsposp("S09G",imax+4*idiv+4,"C09M",-xvol,-yvol, z1-z2, 0, "ONLY",divpar,3); - gMC->Gsposp("S10G",imax+4*idiv+4,"C10M",-xvol,-yvol, z1-z2, 0, "ONLY",divpar,3); + gMC->Gsposp("S09G",imax+4*idiv+1,"S09M", xvol, yvol, z1+z2, 0, "ONLY",divpar,3); + gMC->Gsposp("S10G",imax+4*idiv+1,"S10M", xvol, yvol, z1+z2, 0, "ONLY",divpar,3); + gMC->Gsposp("S09G",imax+4*idiv+2,"S09M", xvol,-yvol, z1+z2, 0, "ONLY",divpar,3); + gMC->Gsposp("S10G",imax+4*idiv+2,"S10M", xvol,-yvol, z1+z2, 0, "ONLY",divpar,3); + gMC->Gsposp("S09G",imax+4*idiv+3,"S09M",-xvol, yvol, z1-z2, 0, "ONLY",divpar,3); + gMC->Gsposp("S10G",imax+4*idiv+3,"S10M",-xvol, yvol, z1-z2, 0, "ONLY",divpar,3); + gMC->Gsposp("S09G",imax+4*idiv+4,"S09M",-xvol,-yvol, z1-z2, 0, "ONLY",divpar,3); + gMC->Gsposp("S10G",imax+4*idiv+4,"S10M",-xvol,-yvol, z1-z2, 0, "ONLY",divpar,3); } } @@ -1200,16 +1361,19 @@ void AliMUONv1::CreateGeometry() // Parameters of the Trigger Chambers - +// DP03-01 introduce dead zone of +/- 2 cm arround x=0 (as in TDR, fig3.27) + const Float_t kDXZERO=2.; const Float_t kXMC1MIN=34.; const Float_t kXMC1MED=51.; const Float_t kXMC1MAX=272.; const Float_t kYMC1MIN=34.; const Float_t kYMC1MAX=51.; const Float_t kRMIN1=50.; - const Float_t kRMAX1=62.; +// DP03-01 const Float_t kRMAX1=62.; + const Float_t kRMAX1=64.; const Float_t kRMIN2=50.; - const Float_t kRMAX2=66.; +// DP03-01 const Float_t kRMAX2=66.; + const Float_t kRMAX2=68.; // zposition of the middle of the gas gap in mother vol const Float_t kZMCm=-3.6; @@ -1243,17 +1407,17 @@ void AliMUONv1::CreateGeometry() tpar[0] = iChamber->RInner(); tpar[1] = iChamber->ROuter(); tpar[2] = 4.0; - gMC->Gsvolu("CM11", "TUBE", idAir, tpar, 3); - gMC->Gsvolu("CM12", "TUBE", idAir, tpar, 3); + gMC->Gsvolu("SM11", "TUBE", idAir, tpar, 3); + gMC->Gsvolu("SM12", "TUBE", idAir, tpar, 3); // Definition of the flange between the beam shielding and the RPC tpar[0]= kRMIN1; tpar[1]= kRMAX1; tpar[2]= 4.0; - gMC->Gsvolu("CF1A", "TUBE", idAlu1, tpar, 3); //Al - gMC->Gspos("CF1A", 1, "CM11", 0., 0., 0., 0, "MANY"); - gMC->Gspos("CF1A", 2, "CM12", 0., 0., 0., 0, "MANY"); + gMC->Gsvolu("SF1A", "TUBE", idAlu1, tpar, 3); //Al + gMC->Gspos("SF1A", 1, "SM11", 0., 0., 0., 0, "MANY"); + gMC->Gspos("SF1A", 2, "SM12", 0., 0., 0., 0, "MANY"); // FIRST PLANE OF STATION 1 @@ -1269,29 +1433,30 @@ void AliMUONv1::CreateGeometry() tpar[1]= 0.; tpar[2]= 0.; - gMC->Gsvolu("CC1A", "BOX ", idAlu1, tpar, 0); //Al - gMC->Gsvolu("CB1A", "BOX ", idtmed[1107], tpar, 0); //Bakelite - gMC->Gsvolu("CG1A", "BOX ", idtmed[1106], tpar, 0); //Gas streamer + gMC->Gsvolu("SC1A", "BOX ", idAlu1, tpar, 0); //Al + gMC->Gsvolu("SB1A", "BOX ", idtmed[1107], tpar, 0); //Bakelite + gMC->Gsvolu("SG1A", "BOX ", idtmed[1106], tpar, 0); //Gas streamer // chamber type A tpar[0] = -1.; tpar[1] = -1.; - const Float_t kXMC1A=kXMC1MED+(kXMC1MAX-kXMC1MED)/2.; +// DP03-01 const Float_t kXMC1A=kXMC1MED+(kXMC1MAX-kXMC1MED)/2.; + const Float_t kXMC1A=kDXZERO+kXMC1MED+(kXMC1MAX-kXMC1MED)/2.; const Float_t kYMC1Am=0.; const Float_t kYMC1Ap=0.; tpar[2] = 0.1; - gMC->Gsposp("CG1A", 1, "CB1A", 0., 0., 0., 0, "ONLY",tpar,3); + gMC->Gsposp("SG1A", 1, "SB1A", 0., 0., 0., 0, "ONLY",tpar,3); tpar[2] = 0.3; - gMC->Gsposp("CB1A", 1, "CC1A", 0., 0., 0., 0, "ONLY",tpar,3); + gMC->Gsposp("SB1A", 1, "SC1A", 0., 0., 0., 0, "ONLY",tpar,3); tpar[2] = 0.4; tpar[0] = (kXMC1MAX-kXMC1MED)/2.; tpar[1] = kYMC1MIN; - gMC->Gsposp("CC1A", 1, "CM11",kXMC1A,kYMC1Am,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC1A", 2, "CM11",-kXMC1A,kYMC1Ap,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC1A", 1, "SM11",kXMC1A,kYMC1Am,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC1A", 2, "SM11",-kXMC1A,kYMC1Ap,kZMCp, 0, "ONLY", tpar, 3); // chamber type B Float_t tpar1save=tpar[1]; @@ -1301,14 +1466,15 @@ void AliMUONv1::CreateGeometry() tpar[0] = (kXMC1MAX-kXMC1MIN)/2.; tpar[1] = (kYMC1MAX-kYMC1MIN)/2.; - const Float_t kXMC1B=kXMC1MIN+tpar[0]; +// DP03-01 const Float_t kXMC1B=kXMC1MIN+tpar[0]; + const Float_t kXMC1B=kDXZERO+kXMC1MIN+tpar[0]; const Float_t kYMC1Bp=(y1msave+tpar1save)*zpm+tpar[1]; const Float_t kYMC1Bm=(y1psave+tpar1save)*zmp+tpar[1]; - gMC->Gsposp("CC1A", 3, "CM11",kXMC1B,kYMC1Bp,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC1A", 4, "CM11",-kXMC1B,kYMC1Bm,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC1A", 5, "CM11",kXMC1B,-kYMC1Bp,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC1A", 6, "CM11",-kXMC1B,-kYMC1Bm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC1A", 3, "SM11",kXMC1B,kYMC1Bp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC1A", 4, "SM11",-kXMC1B,kYMC1Bm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC1A", 5, "SM11",kXMC1B,-kYMC1Bp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC1A", 6, "SM11",-kXMC1B,-kYMC1Bm,kZMCm, 0, "ONLY", tpar, 3); // chamber type C (end of type B !!) tpar1save=tpar[1]; @@ -1318,15 +1484,17 @@ void AliMUONv1::CreateGeometry() tpar[0] = kXMC1MAX/2; tpar[1] = kYMC1MAX/2; - const Float_t kXMC1C=tpar[0]; + +// DP03-01 const Float_t kXMC1C=tpar[0]; + const Float_t kXMC1C=kDXZERO+tpar[0]; // warning : same Z than type B const Float_t kYMC1Cp=(y1psave+tpar1save)*1.+tpar[1]; const Float_t kYMC1Cm=(y1msave+tpar1save)*1.+tpar[1]; - gMC->Gsposp("CC1A", 7, "CM11",kXMC1C,kYMC1Cp,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC1A", 8, "CM11",-kXMC1C,kYMC1Cm,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC1A", 9, "CM11",kXMC1C,-kYMC1Cp,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC1A", 10, "CM11",-kXMC1C,-kYMC1Cm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC1A", 7, "SM11",kXMC1C,kYMC1Cp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC1A", 8, "SM11",-kXMC1C,kYMC1Cm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC1A", 9, "SM11",kXMC1C,-kYMC1Cp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC1A", 10, "SM11",-kXMC1C,-kYMC1Cm,kZMCm, 0, "ONLY", tpar, 3); // chamber type D, E and F (same size) tpar1save=tpar[1]; @@ -1336,14 +1504,15 @@ void AliMUONv1::CreateGeometry() tpar[0] = kXMC1MAX/2.; tpar[1] = kYMC1MIN; - const Float_t kXMC1D=tpar[0]; +// DP03-01 const Float_t kXMC1D=tpar[0]; + const Float_t kXMC1D=kDXZERO+tpar[0]; const Float_t kYMC1Dp=(y1msave+tpar1save)*zpm+tpar[1]; const Float_t kYMC1Dm=(y1psave+tpar1save)*zmp+tpar[1]; - gMC->Gsposp("CC1A", 11, "CM11",kXMC1D,kYMC1Dm,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC1A", 12, "CM11",-kXMC1D,kYMC1Dp,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC1A", 13, "CM11",kXMC1D,-kYMC1Dm,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC1A", 14, "CM11",-kXMC1D,-kYMC1Dp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC1A", 11, "SM11",kXMC1D,kYMC1Dm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC1A", 12, "SM11",-kXMC1D,kYMC1Dp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC1A", 13, "SM11",kXMC1D,-kYMC1Dm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC1A", 14, "SM11",-kXMC1D,-kYMC1Dp,kZMCp, 0, "ONLY", tpar, 3); tpar1save=tpar[1]; @@ -1352,10 +1521,10 @@ void AliMUONv1::CreateGeometry() const Float_t kYMC1Ep=(y1msave+tpar1save)*zpm+tpar[1]; const Float_t kYMC1Em=(y1psave+tpar1save)*zmp+tpar[1]; - gMC->Gsposp("CC1A", 15, "CM11",kXMC1D,kYMC1Ep,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC1A", 16, "CM11",-kXMC1D,kYMC1Em,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC1A", 17, "CM11",kXMC1D,-kYMC1Ep,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC1A", 18, "CM11",-kXMC1D,-kYMC1Em,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC1A", 15, "SM11",kXMC1D,kYMC1Ep,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC1A", 16, "SM11",-kXMC1D,kYMC1Em,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC1A", 17, "SM11",kXMC1D,-kYMC1Ep,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC1A", 18, "SM11",-kXMC1D,-kYMC1Em,kZMCm, 0, "ONLY", tpar, 3); tpar1save=tpar[1]; y1msave=kYMC1Em; @@ -1363,13 +1532,13 @@ void AliMUONv1::CreateGeometry() const Float_t kYMC1Fp=(y1msave+tpar1save)*zpm+tpar[1]; const Float_t kYMC1Fm=(y1psave+tpar1save)*zmp+tpar[1]; - gMC->Gsposp("CC1A", 19, "CM11",kXMC1D,kYMC1Fm,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC1A", 20, "CM11",-kXMC1D,kYMC1Fp,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC1A", 21, "CM11",kXMC1D,-kYMC1Fm,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC1A", 22, "CM11",-kXMC1D,-kYMC1Fp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC1A", 19, "SM11",kXMC1D,kYMC1Fm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC1A", 20, "SM11",-kXMC1D,kYMC1Fp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC1A", 21, "SM11",kXMC1D,-kYMC1Fm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC1A", 22, "SM11",-kXMC1D,-kYMC1Fp,kZMCp, 0, "ONLY", tpar, 3); // Positioning first plane in ALICE - gMC->Gspos("CM11", 1, "ALIC", 0., 0., zpos1, 0, "ONLY"); + gMC->Gspos("SM11", 1, "ALIC", 0., 0., zpos1, 0, "ONLY"); // End of geometry definition for the first plane of station 1 @@ -1385,9 +1554,9 @@ void AliMUONv1::CreateGeometry() tpar[1]= 0.; tpar[2]= 0.; - gMC->Gsvolu("CC2A", "BOX ", idAlu1, tpar, 0); //Al - gMC->Gsvolu("CB2A", "BOX ", idtmed[1107], tpar, 0); //Bakelite - gMC->Gsvolu("CG2A", "BOX ", idtmed[1106], tpar, 0); //Gas streamer + gMC->Gsvolu("SC2A", "BOX ", idAlu1, tpar, 0); //Al + gMC->Gsvolu("SB2A", "BOX ", idtmed[1107], tpar, 0); //Bakelite + gMC->Gsvolu("SG2A", "BOX ", idtmed[1106], tpar, 0); //Gas streamer // chamber type A tpar[0] = -1.; @@ -1398,16 +1567,16 @@ void AliMUONv1::CreateGeometry() const Float_t kYMC2Ap=0.; tpar[2] = 0.1; - gMC->Gsposp("CG2A", 1, "CB2A", 0., 0., 0., 0, "ONLY",tpar,3); + gMC->Gsposp("SG2A", 1, "SB2A", 0., 0., 0., 0, "ONLY",tpar,3); tpar[2] = 0.3; - gMC->Gsposp("CB2A", 1, "CC2A", 0., 0., 0., 0, "ONLY",tpar,3); + gMC->Gsposp("SB2A", 1, "SC2A", 0., 0., 0., 0, "ONLY",tpar,3); tpar[2] = 0.4; tpar[0] = ((kXMC1MAX-kXMC1MED)/2.)*kZ12; tpar[1] = kYMC1MIN*kZ12; - gMC->Gsposp("CC2A", 1, "CM12",kXMC2A,kYMC2Am,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC2A", 2, "CM12",-kXMC2A,kYMC2Ap,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC2A", 1, "SM12",kXMC2A,kYMC2Am,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC2A", 2, "SM12",-kXMC2A,kYMC2Ap,kZMCp, 0, "ONLY", tpar, 3); // chamber type B @@ -1418,10 +1587,10 @@ void AliMUONv1::CreateGeometry() const Float_t kXMC2B=kXMC1B*kZ12; const Float_t kYMC2Bp=kYMC1Bp*kZ12; const Float_t kYMC2Bm=kYMC1Bm*kZ12; - gMC->Gsposp("CC2A", 3, "CM12",kXMC2B,kYMC2Bp,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC2A", 4, "CM12",-kXMC2B,kYMC2Bm,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC2A", 5, "CM12",kXMC2B,-kYMC2Bp,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC2A", 6, "CM12",-kXMC2B,-kYMC2Bm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC2A", 3, "SM12",kXMC2B,kYMC2Bp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC2A", 4, "SM12",-kXMC2B,kYMC2Bm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC2A", 5, "SM12",kXMC2B,-kYMC2Bp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC2A", 6, "SM12",-kXMC2B,-kYMC2Bm,kZMCm, 0, "ONLY", tpar, 3); // chamber type C (end of type B !!) @@ -1432,10 +1601,10 @@ void AliMUONv1::CreateGeometry() const Float_t kXMC2C=kXMC1C*kZ12; const Float_t kYMC2Cp=kYMC1Cp*kZ12; const Float_t kYMC2Cm=kYMC1Cm*kZ12; - gMC->Gsposp("CC2A", 7, "CM12",kXMC2C,kYMC2Cp,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC2A", 8, "CM12",-kXMC2C,kYMC2Cm,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC2A", 9, "CM12",kXMC2C,-kYMC2Cp,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC2A", 10, "CM12",-kXMC2C,-kYMC2Cm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC2A", 7, "SM12",kXMC2C,kYMC2Cp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC2A", 8, "SM12",-kXMC2C,kYMC2Cm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC2A", 9, "SM12",kXMC2C,-kYMC2Cp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC2A", 10, "SM12",-kXMC2C,-kYMC2Cm,kZMCm, 0, "ONLY", tpar, 3); // chamber type D, E and F (same size) @@ -1445,29 +1614,29 @@ void AliMUONv1::CreateGeometry() const Float_t kXMC2D=kXMC1D*kZ12; const Float_t kYMC2Dp=kYMC1Dp*kZ12; const Float_t kYMC2Dm=kYMC1Dm*kZ12; - gMC->Gsposp("CC2A", 11, "CM12",kXMC2D,kYMC2Dm,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC2A", 12, "CM12",-kXMC2D,kYMC2Dp,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC2A", 13, "CM12",kXMC2D,-kYMC2Dm,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC2A", 14, "CM12",-kXMC2D,-kYMC2Dp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC2A", 11, "SM12",kXMC2D,kYMC2Dm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC2A", 12, "SM12",-kXMC2D,kYMC2Dp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC2A", 13, "SM12",kXMC2D,-kYMC2Dm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC2A", 14, "SM12",-kXMC2D,-kYMC2Dp,kZMCp, 0, "ONLY", tpar, 3); const Float_t kYMC2Ep=kYMC1Ep*kZ12; const Float_t kYMC2Em=kYMC1Em*kZ12; - gMC->Gsposp("CC2A", 15, "CM12",kXMC2D,kYMC2Ep,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC2A", 16, "CM12",-kXMC2D,kYMC2Em,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC2A", 17, "CM12",kXMC2D,-kYMC2Ep,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC2A", 18, "CM12",-kXMC2D,-kYMC2Em,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC2A", 15, "SM12",kXMC2D,kYMC2Ep,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC2A", 16, "SM12",-kXMC2D,kYMC2Em,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC2A", 17, "SM12",kXMC2D,-kYMC2Ep,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC2A", 18, "SM12",-kXMC2D,-kYMC2Em,kZMCm, 0, "ONLY", tpar, 3); const Float_t kYMC2Fp=kYMC1Fp*kZ12; const Float_t kYMC2Fm=kYMC1Fm*kZ12; - gMC->Gsposp("CC2A", 19, "CM12",kXMC2D,kYMC2Fm,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC2A", 20, "CM12",-kXMC2D,kYMC2Fp,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC2A", 21, "CM12",kXMC2D,-kYMC2Fm,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC2A", 22, "CM12",-kXMC2D,-kYMC2Fp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC2A", 19, "SM12",kXMC2D,kYMC2Fm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC2A", 20, "SM12",-kXMC2D,kYMC2Fp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC2A", 21, "SM12",kXMC2D,-kYMC2Fm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC2A", 22, "SM12",-kXMC2D,-kYMC2Fp,kZMCp, 0, "ONLY", tpar, 3); // Positioning second plane of station 1 in ALICE - gMC->Gspos("CM12", 1, "ALIC", 0., 0., zpos2, 0, "ONLY"); + gMC->Gspos("SM12", 1, "ALIC", 0., 0., zpos2, 0, "ONLY"); // End of geometry definition for the second plane of station 1 @@ -1496,8 +1665,8 @@ void AliMUONv1::CreateGeometry() tpar[1] = iChamber->ROuter(); tpar[2] = 4.0; - gMC->Gsvolu("CM21", "TUBE", idAir, tpar, 3); - gMC->Gsvolu("CM22", "TUBE", idAir, tpar, 3); + gMC->Gsvolu("SM21", "TUBE", idAir, tpar, 3); + gMC->Gsvolu("SM22", "TUBE", idAir, tpar, 3); // Definition of the flange between the beam shielding and the RPC // ???? interface shielding @@ -1506,9 +1675,9 @@ void AliMUONv1::CreateGeometry() tpar[1]= kRMAX2; tpar[2]= 4.0; - gMC->Gsvolu("CF2A", "TUBE", idAlu1, tpar, 3); //Al - gMC->Gspos("CF2A", 1, "CM21", 0., 0., 0., 0, "MANY"); - gMC->Gspos("CF2A", 2, "CM22", 0., 0., 0., 0, "MANY"); + gMC->Gsvolu("SF2A", "TUBE", idAlu1, tpar, 3); //Al + gMC->Gspos("SF2A", 1, "SM21", 0., 0., 0., 0, "MANY"); + gMC->Gspos("SF2A", 2, "SM22", 0., 0., 0., 0, "MANY"); @@ -1521,9 +1690,9 @@ void AliMUONv1::CreateGeometry() tpar[1]= 0.; tpar[2]= 0.; - gMC->Gsvolu("CC3A", "BOX ", idAlu1, tpar, 0); //Al - gMC->Gsvolu("CB3A", "BOX ", idtmed[1107], tpar, 0); //Bakelite - gMC->Gsvolu("CG3A", "BOX ", idtmed[1106], tpar, 0); //Gas streamer + gMC->Gsvolu("SC3A", "BOX ", idAlu1, tpar, 0); //Al + gMC->Gsvolu("SB3A", "BOX ", idtmed[1107], tpar, 0); //Bakelite + gMC->Gsvolu("SG3A", "BOX ", idtmed[1106], tpar, 0); //Gas streamer // chamber type A @@ -1535,15 +1704,15 @@ void AliMUONv1::CreateGeometry() const Float_t kYMC3Ap=0.; tpar[2] = 0.1; - gMC->Gsposp("CG3A", 1, "CB3A", 0., 0., 0., 0, "ONLY",tpar,3); + gMC->Gsposp("SG3A", 1, "SB3A", 0., 0., 0., 0, "ONLY",tpar,3); tpar[2] = 0.3; - gMC->Gsposp("CB3A", 1, "CC3A", 0., 0., 0., 0, "ONLY",tpar,3); + gMC->Gsposp("SB3A", 1, "SC3A", 0., 0., 0., 0, "ONLY",tpar,3); tpar[2] = 0.4; tpar[0] = ((kXMC1MAX-kXMC1MED)/2.)*kZ13; tpar[1] = kYMC1MIN*kZ13; - gMC->Gsposp("CC3A", 1, "CM21",kXMC3A,kYMC3Am,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC3A", 2, "CM21",-kXMC3A,kYMC3Ap,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC3A", 1, "SM21",kXMC3A,kYMC3Am,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC3A", 2, "SM21",-kXMC3A,kYMC3Ap,kZMCp, 0, "ONLY", tpar, 3); // chamber type B @@ -1553,10 +1722,10 @@ void AliMUONv1::CreateGeometry() const Float_t kXMC3B=kXMC1B*kZ13; const Float_t kYMC3Bp=kYMC1Bp*kZ13; const Float_t kYMC3Bm=kYMC1Bm*kZ13; - gMC->Gsposp("CC3A", 3, "CM21",kXMC3B,kYMC3Bp,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC3A", 4, "CM21",-kXMC3B,kYMC3Bm,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC3A", 5, "CM21",kXMC3B,-kYMC3Bp,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC3A", 6, "CM21",-kXMC3B,-kYMC3Bm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC3A", 3, "SM21",kXMC3B,kYMC3Bp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC3A", 4, "SM21",-kXMC3B,kYMC3Bm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC3A", 5, "SM21",kXMC3B,-kYMC3Bp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC3A", 6, "SM21",-kXMC3B,-kYMC3Bm,kZMCm, 0, "ONLY", tpar, 3); // chamber type C (end of type B !!) @@ -1566,10 +1735,10 @@ void AliMUONv1::CreateGeometry() const Float_t kXMC3C=kXMC1C*kZ13; const Float_t kYMC3Cp=kYMC1Cp*kZ13; const Float_t kYMC3Cm=kYMC1Cm*kZ13; - gMC->Gsposp("CC3A", 7, "CM21",kXMC3C,kYMC3Cp,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC3A", 8, "CM21",-kXMC3C,kYMC3Cm,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC3A", 9, "CM21",kXMC3C,-kYMC3Cp,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC3A", 10, "CM21",-kXMC3C,-kYMC3Cm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC3A", 7, "SM21",kXMC3C,kYMC3Cp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC3A", 8, "SM21",-kXMC3C,kYMC3Cm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC3A", 9, "SM21",kXMC3C,-kYMC3Cp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC3A", 10, "SM21",-kXMC3C,-kYMC3Cm,kZMCm, 0, "ONLY", tpar, 3); // chamber type D, E and F (same size) @@ -1580,29 +1749,29 @@ void AliMUONv1::CreateGeometry() const Float_t kXMC3D=kXMC1D*kZ13; const Float_t kYMC3Dp=kYMC1Dp*kZ13; const Float_t kYMC3Dm=kYMC1Dm*kZ13; - gMC->Gsposp("CC3A", 11, "CM21",kXMC3D,kYMC3Dm,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC3A", 12, "CM21",-kXMC3D,kYMC3Dp,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC3A", 13, "CM21",kXMC3D,-kYMC3Dm,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC3A", 14, "CM21",-kXMC3D,-kYMC3Dp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC3A", 11, "SM21",kXMC3D,kYMC3Dm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC3A", 12, "SM21",-kXMC3D,kYMC3Dp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC3A", 13, "SM21",kXMC3D,-kYMC3Dm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC3A", 14, "SM21",-kXMC3D,-kYMC3Dp,kZMCp, 0, "ONLY", tpar, 3); const Float_t kYMC3Ep=kYMC1Ep*kZ13; const Float_t kYMC3Em=kYMC1Em*kZ13; - gMC->Gsposp("CC3A", 15, "CM21",kXMC3D,kYMC3Ep,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC3A", 16, "CM21",-kXMC3D,kYMC3Em,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC3A", 17, "CM21",kXMC3D,-kYMC3Ep,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC3A", 18, "CM21",-kXMC3D,-kYMC3Em,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC3A", 15, "SM21",kXMC3D,kYMC3Ep,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC3A", 16, "SM21",-kXMC3D,kYMC3Em,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC3A", 17, "SM21",kXMC3D,-kYMC3Ep,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC3A", 18, "SM21",-kXMC3D,-kYMC3Em,kZMCm, 0, "ONLY", tpar, 3); const Float_t kYMC3Fp=kYMC1Fp*kZ13; const Float_t kYMC3Fm=kYMC1Fm*kZ13; - gMC->Gsposp("CC3A", 19, "CM21",kXMC3D,kYMC3Fm,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC3A", 20, "CM21",-kXMC3D,kYMC3Fp,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC3A", 21, "CM21",kXMC3D,-kYMC3Fm,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC3A", 22, "CM21",-kXMC3D,-kYMC3Fp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC3A", 19, "SM21",kXMC3D,kYMC3Fm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC3A", 20, "SM21",-kXMC3D,kYMC3Fp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC3A", 21, "SM21",kXMC3D,-kYMC3Fm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC3A", 22, "SM21",-kXMC3D,-kYMC3Fp,kZMCp, 0, "ONLY", tpar, 3); // Positioning first plane of station 2 in ALICE - gMC->Gspos("CM21", 1, "ALIC", 0., 0., zpos3, 0, "ONLY"); + gMC->Gspos("SM21", 1, "ALIC", 0., 0., zpos3, 0, "ONLY"); // End of geometry definition for the first plane of station 2 @@ -1619,9 +1788,9 @@ void AliMUONv1::CreateGeometry() tpar[1]= 0.; tpar[2]= 0.; - gMC->Gsvolu("CC4A", "BOX ", idAlu1, tpar, 0); //Al - gMC->Gsvolu("CB4A", "BOX ", idtmed[1107], tpar, 0); //Bakelite - gMC->Gsvolu("CG4A", "BOX ", idtmed[1106], tpar, 0); //Gas streamer + gMC->Gsvolu("SC4A", "BOX ", idAlu1, tpar, 0); //Al + gMC->Gsvolu("SB4A", "BOX ", idtmed[1107], tpar, 0); //Bakelite + gMC->Gsvolu("SG4A", "BOX ", idtmed[1106], tpar, 0); //Gas streamer // chamber type A tpar[0] = -1.; @@ -1632,15 +1801,15 @@ void AliMUONv1::CreateGeometry() const Float_t kYMC4Ap=0.; tpar[2] = 0.1; - gMC->Gsposp("CG4A", 1, "CB4A", 0., 0., 0., 0, "ONLY",tpar,3); + gMC->Gsposp("SG4A", 1, "SB4A", 0., 0., 0., 0, "ONLY",tpar,3); tpar[2] = 0.3; - gMC->Gsposp("CB4A", 1, "CC4A", 0., 0., 0., 0, "ONLY",tpar,3); + gMC->Gsposp("SB4A", 1, "SC4A", 0., 0., 0., 0, "ONLY",tpar,3); tpar[2] = 0.4; tpar[0] = ((kXMC1MAX-kXMC1MED)/2.)*kZ14; tpar[1] = kYMC1MIN*kZ14; - gMC->Gsposp("CC4A", 1, "CM22",kXMC4A,kYMC4Am,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC4A", 2, "CM22",-kXMC4A,kYMC4Ap,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC4A", 1, "SM22",kXMC4A,kYMC4Am,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC4A", 2, "SM22",-kXMC4A,kYMC4Ap,kZMCp, 0, "ONLY", tpar, 3); // chamber type B @@ -1650,10 +1819,10 @@ void AliMUONv1::CreateGeometry() const Float_t kXMC4B=kXMC1B*kZ14; const Float_t kYMC4Bp=kYMC1Bp*kZ14; const Float_t kYMC4Bm=kYMC1Bm*kZ14; - gMC->Gsposp("CC4A", 3, "CM22",kXMC4B,kYMC4Bp,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC4A", 4, "CM22",-kXMC4B,kYMC4Bm,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC4A", 5, "CM22",kXMC4B,-kYMC4Bp,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC4A", 6, "CM22",-kXMC4B,-kYMC4Bm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC4A", 3, "SM22",kXMC4B,kYMC4Bp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC4A", 4, "SM22",-kXMC4B,kYMC4Bm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC4A", 5, "SM22",kXMC4B,-kYMC4Bp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC4A", 6, "SM22",-kXMC4B,-kYMC4Bm,kZMCm, 0, "ONLY", tpar, 3); // chamber type C (end of type B !!) @@ -1663,10 +1832,10 @@ void AliMUONv1::CreateGeometry() const Float_t kXMC4C=kXMC1C*kZ14; const Float_t kYMC4Cp=kYMC1Cp*kZ14; const Float_t kYMC4Cm=kYMC1Cm*kZ14; - gMC->Gsposp("CC4A", 7, "CM22",kXMC4C,kYMC4Cp,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC4A", 8, "CM22",-kXMC4C,kYMC4Cm,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC4A", 9, "CM22",kXMC4C,-kYMC4Cp,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC4A", 10, "CM22",-kXMC4C,-kYMC4Cm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC4A", 7, "SM22",kXMC4C,kYMC4Cp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC4A", 8, "SM22",-kXMC4C,kYMC4Cm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC4A", 9, "SM22",kXMC4C,-kYMC4Cp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC4A", 10, "SM22",-kXMC4C,-kYMC4Cm,kZMCm, 0, "ONLY", tpar, 3); // chamber type D, E and F (same size) @@ -1676,29 +1845,29 @@ void AliMUONv1::CreateGeometry() const Float_t kXMC4D=kXMC1D*kZ14; const Float_t kYMC4Dp=kYMC1Dp*kZ14; const Float_t kYMC4Dm=kYMC1Dm*kZ14; - gMC->Gsposp("CC4A", 11, "CM22",kXMC4D,kYMC4Dm,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC4A", 12, "CM22",-kXMC4D,kYMC4Dp,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC4A", 13, "CM22",kXMC4D,-kYMC4Dm,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC4A", 14, "CM22",-kXMC4D,-kYMC4Dp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC4A", 11, "SM22",kXMC4D,kYMC4Dm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC4A", 12, "SM22",-kXMC4D,kYMC4Dp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC4A", 13, "SM22",kXMC4D,-kYMC4Dm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC4A", 14, "SM22",-kXMC4D,-kYMC4Dp,kZMCp, 0, "ONLY", tpar, 3); const Float_t kYMC4Ep=kYMC1Ep*kZ14; const Float_t kYMC4Em=kYMC1Em*kZ14; - gMC->Gsposp("CC4A", 15, "CM22",kXMC4D,kYMC4Ep,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC4A", 16, "CM22",-kXMC4D,kYMC4Em,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC4A", 17, "CM22",kXMC4D,-kYMC4Ep,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC4A", 18, "CM22",-kXMC4D,-kYMC4Em,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC4A", 15, "SM22",kXMC4D,kYMC4Ep,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC4A", 16, "SM22",-kXMC4D,kYMC4Em,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC4A", 17, "SM22",kXMC4D,-kYMC4Ep,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC4A", 18, "SM22",-kXMC4D,-kYMC4Em,kZMCm, 0, "ONLY", tpar, 3); const Float_t kYMC4Fp=kYMC1Fp*kZ14; const Float_t kYMC4Fm=kYMC1Fm*kZ14; - gMC->Gsposp("CC4A", 19, "CM22",kXMC4D,kYMC4Fm,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC4A", 20, "CM22",-kXMC4D,kYMC4Fp,kZMCp, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC4A", 21, "CM22",kXMC4D,-kYMC4Fm,kZMCm, 0, "ONLY", tpar, 3); - gMC->Gsposp("CC4A", 22, "CM22",-kXMC4D,-kYMC4Fp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC4A", 19, "SM22",kXMC4D,kYMC4Fm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC4A", 20, "SM22",-kXMC4D,kYMC4Fp,kZMCp, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC4A", 21, "SM22",kXMC4D,-kYMC4Fm,kZMCm, 0, "ONLY", tpar, 3); + gMC->Gsposp("SC4A", 22, "SM22",-kXMC4D,-kYMC4Fp,kZMCp, 0, "ONLY", tpar, 3); // Positioning second plane of station 2 in ALICE - gMC->Gspos("CM22", 1, "ALIC", 0., 0., zpos4, 0, "ONLY"); + gMC->Gspos("SM22", 1, "ALIC", 0., 0., zpos4, 0, "ONLY"); // End of geometry definition for the second plane of station 2 @@ -1713,7 +1882,7 @@ void AliMUONv1::CreateMaterials() { // *** DEFINITION OF AVAILABLE MUON MATERIALS *** // - // Ar-CO2 gas + // Ar-CO2 gas (80%+20%) Float_t ag1[3] = { 39.95,12.01,16. }; Float_t zg1[3] = { 18.,6.,8. }; Float_t wg1[3] = { .8,.0667,.13333 }; @@ -1836,7 +2005,7 @@ void AliMUONv1::Init() // Initialize Tracking Chambers // - printf("\n\n\n Start Init for version 1 - CPC chamber type\n\n\n"); + if(fDebug) printf("\n%s: Start Init for version 1 - CPC chamber type\n\n",ClassName()); Int_t i; for (i=0; iInit(); @@ -1845,11 +2014,11 @@ void AliMUONv1::Init() // // Set the chamber (sensitive region) GEANT identifier AliMC* gMC = AliMC::GetMC(); - ((AliMUONChamber*)(*fChambers)[0])->SetGid(gMC->VolId("C01G")); - ((AliMUONChamber*)(*fChambers)[1])->SetGid(gMC->VolId("C02G")); + ((AliMUONChamber*)(*fChambers)[0])->SetGid(gMC->VolId("S01G")); + ((AliMUONChamber*)(*fChambers)[1])->SetGid(gMC->VolId("S02G")); - ((AliMUONChamber*)(*fChambers)[2])->SetGid(gMC->VolId("C03G")); - ((AliMUONChamber*)(*fChambers)[3])->SetGid(gMC->VolId("C04G")); + ((AliMUONChamber*)(*fChambers)[2])->SetGid(gMC->VolId("S03G")); + ((AliMUONChamber*)(*fChambers)[3])->SetGid(gMC->VolId("S04G")); ((AliMUONChamber*)(*fChambers)[4])->SetGid(gMC->VolId("S05G")); ((AliMUONChamber*)(*fChambers)[5])->SetGid(gMC->VolId("S06G")); @@ -1860,19 +2029,19 @@ void AliMUONv1::Init() ((AliMUONChamber*)(*fChambers)[8])->SetGid(gMC->VolId("S09G")); ((AliMUONChamber*)(*fChambers)[9])->SetGid(gMC->VolId("S10G")); - ((AliMUONChamber*)(*fChambers)[10])->SetGid(gMC->VolId("CG1A")); - ((AliMUONChamber*)(*fChambers)[11])->SetGid(gMC->VolId("CG2A")); - ((AliMUONChamber*)(*fChambers)[12])->SetGid(gMC->VolId("CG3A")); - ((AliMUONChamber*)(*fChambers)[13])->SetGid(gMC->VolId("CG4A")); + ((AliMUONChamber*)(*fChambers)[10])->SetGid(gMC->VolId("SG1A")); + ((AliMUONChamber*)(*fChambers)[11])->SetGid(gMC->VolId("SG2A")); + ((AliMUONChamber*)(*fChambers)[12])->SetGid(gMC->VolId("SG3A")); + ((AliMUONChamber*)(*fChambers)[13])->SetGid(gMC->VolId("SG4A")); - printf("\n\n\n Finished Init for version 0 - CPC chamber type\n\n\n"); + if(fDebug) printf("\n%s: Finished Init for version 1 - CPC chamber type\n",ClassName()); //cp - printf("\n\n\n Start Init for Trigger Circuits\n\n\n"); + if(fDebug) printf("\n%s: Start Init for Trigger Circuits\n",ClassName()); for (i=0; iInit(i); } - printf(" Finished Init for Trigger Circuits\n\n\n"); + if(fDebug) printf("%s: Finished Init for Trigger Circuits\n",ClassName()); //cp } @@ -1888,17 +2057,14 @@ void AliMUONv1::StepManager() TLorentzVector mom; Float_t theta,phi; Float_t destep, step; - + static Float_t eloss, eloss2, xhit, yhit, zhit, tof, tlength; - const Float_t kBig=1.e10; - // modifs perso + const Float_t kBig = 1.e10; static Float_t hits[15]; TClonesArray &lhits = *fHits; // - // Set maximum step size for gas - // numed=gMC->GetMedium(); // // Only charged tracks if( !(gMC->TrackCharge()) ) return; @@ -1908,10 +2074,10 @@ void AliMUONv1::StepManager() idvol=-1; id=gMC->CurrentVolID(copy); - for (Int_t i=1; i<=AliMUONConstants::NCh(); i++) { + for (Int_t i = 1; i <= AliMUONConstants::NCh(); i++) { if(id==((AliMUONChamber*)(*fChambers)[i-1])->GetGid()){ - vol[0]=i; - idvol=i-1; + vol[0] = i; + idvol = i-1; } } if (idvol == -1) return; @@ -1921,8 +2087,6 @@ void AliMUONv1::StepManager() gMC->TrackMomentum(mom); ipart = gMC->TrackPid(); - //Int_t ipart1 = gMC->IdFromPDG(ipart); - //printf("ich, ipart %d %d \n",vol[0],ipart1); // // momentum loss and steplength in last step @@ -1936,44 +2100,41 @@ void AliMUONv1::StepManager() Double_t tc = mom[0]*mom[0]+mom[1]*mom[1]; Double_t rt = TMath::Sqrt(tc); Double_t pmom = TMath::Sqrt(tc+mom[2]*mom[2]); - Double_t tx=mom[0]/pmom; - Double_t ty=mom[1]/pmom; - Double_t tz=mom[2]/pmom; - Double_t s=((AliMUONChamber*)(*fChambers)[idvol]) + Double_t tx = mom[0]/pmom; + Double_t ty = mom[1]/pmom; + Double_t tz = mom[2]/pmom; + Double_t s = ((AliMUONChamber*)(*fChambers)[idvol]) ->ResponseModel() ->Pitch()/tz; theta = Float_t(TMath::ATan2(rt,Double_t(mom[2])))*kRaddeg; phi = Float_t(TMath::ATan2(Double_t(mom[1]),Double_t(mom[0])))*kRaddeg; hits[0] = Float_t(ipart); // Geant3 particle type - hits[1] = pos[0]+s*tx; // X-position for hit - hits[2] = pos[1]+s*ty; // Y-position for hit - hits[3] = pos[2]+s*tz; // Z-position for hit + hits[1] = pos[0]+s*tx; // X-position for hit + hits[2] = pos[1]+s*ty; // Y-position for hit + hits[3] = pos[2]+s*tz; // Z-position for hit hits[4] = theta; // theta angle of incidence hits[5] = phi; // phi angle of incidence - hits[8] = (Float_t) fNPadHits; // first padhit + hits[8] = (Float_t) fNPadHits; // first padhit hits[9] = -1; // last pad hit - - // modifs perso - hits[10] = mom[3]; // hit momentum P - hits[11] = mom[0]; // Px/P - hits[12] = mom[1]; // Py/P - hits[13] = mom[2]; // Pz/P - // fin modifs perso + hits[10] = mom[3]; // hit momentum P + hits[11] = mom[0]; // Px + hits[12] = mom[1]; // Py + hits[13] = mom[2]; // Pz tof=gMC->TrackTime(); - hits[14] = tof; // Time of flight - // phi angle of incidence - tlength = 0; - eloss = 0; - eloss2 = 0; - xhit = pos[0]; - yhit = pos[1]; - zhit = pos[2]; + hits[14] = tof; // Time of flight + tlength = 0; + eloss = 0; + eloss2 = 0; + xhit = pos[0]; + yhit = pos[1]; + zhit = pos[2]; + Chamber(idvol).ChargeCorrelationInit(); // Only if not trigger chamber - if(idvolGmtod(globalPos,localPos,1); - if(idvol0) MakePadHits(x0,y0,z0,eloss,tof,idvol); - hits[6]=tlength; - hits[7]=eloss2; + hits[6] = tlength; // track length + hits[7] = eloss2; // de/dx energy loss + if (fNPadHits > (Int_t)hits[8]) { - hits[8]= hits[8]+1; - hits[9]= (Float_t) fNPadHits; + hits[8] = hits[8]+1; + hits[9] = (Float_t) fNPadHits; } - +// +// new hit + new(lhits[fNhits++]) - AliMUONHit(fIshunt,gAlice->CurrentTrack(),vol,hits); + AliMUONHit(fIshunt, gAlice->CurrentTrack(), vol,hits); eloss = 0; // // Check additional signal generation conditions @@ -2043,13 +2205,14 @@ void AliMUONv1::StepManager() Float_t globalPos[3] = {pos[0], pos[1], pos[2]}; gMC->Gmtod(globalPos,localPos,1); + eloss += destep; if (eloss > 0 && idvol < AliMUONConstants::NTrackingCh()) MakePadHits(0.5*(xhit+pos[0]),0.5*(yhit+pos[1]),pos[2],eloss,tof,idvol); xhit = pos[0]; yhit = pos[1]; - zhit = pos[2]; - eloss = destep; + zhit = pos[2]; + eloss = 0; tlength += step ; // // nothing special happened, add up energy loss