X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSvPPRcoarseasymm.cxx;h=8befa6e4c7e542388acbf3de1824fb525b458dbc;hb=2755f080d19a204a0ac4e87b432a5a8c4b71351a;hp=7a40968f7d6b24e3115a56bcb4ef77a60c24fb75;hpb=9cd18c592dff4a343da1651590478b0d1e44ee9b;p=u%2Fmrichter%2FAliRoot.git diff --git a/ITS/AliITSvPPRcoarseasymm.cxx b/ITS/AliITSvPPRcoarseasymm.cxx index 7a40968f7d6..8befa6e4c7e 100644 --- a/ITS/AliITSvPPRcoarseasymm.cxx +++ b/ITS/AliITSvPPRcoarseasymm.cxx @@ -1,4 +1,4 @@ -/************************************************************************** + /************************************************************************** * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * * * Author: The ALICE Off-line Project. * @@ -13,81 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.14 2001/01/15 13:13:53 barbera -Some comments added - -Revision 1.13 2000/12/10 16:00:45 barbera -Added last definition of special media like end-ladder boxes and cones - -Revision 1.12 2000/11/02 15:44:23 barbera -Services on the opposite side w.r.t the absorber modified to make room for rails - -Revision 1.10 2000/10/27 17:19:50 barbera -Position of rails w.r.t. the interaction point corrected. - -Revision 1.9 2000/10/27 13:31:29 barbera -Rails between ITS and TPC added. - -Revision 1.8 2000/10/27 13:03:08 barbera -Small changes in the SPD volumes and materials - -Revision 1.6 2000/10/16 14:45:37 barbera -Mother volume ITSD modified to avoid some overlaps - -Revision 1.5 2000/10/16 13:49:15 barbera -Services volumes slightly modified and material added following Pierluigi Barberis' information - -Revision 1.4 2000/10/07 15:33:07 barbera -Small corrections to the ITSV mother volume - -Revision 1.3 2000/10/07 13:06:50 barbera -Some new materials and media defined - -Revision 1.2 2000/10/07 10:58:15 barbera -Mother volume ITSV corrected - -Revision 1.1 2000/10/06 23:09:24 barbera -New coarse geometry (asymmetric services - -Revision 1.20 2000/10/02 21:28:08 fca -Removal of useless dependecies via forward declarations - -Revision 1.19 2000/07/10 16:07:19 fca -Release version of ITS code - -Revision 1.14.2.2 2000/05/19 10:09:21 nilsen -fix for bug with HP and Sun unix + fix for event display in ITS-working branch - -Revision 1.14.2.1 2000/03/04 23:45:19 nilsen -Fixed up the comments/documentation. - -Revision 1.14 1999/11/25 06:52:56 fca -Correct value of drca - -Revision 1.13.2.1 1999/11/25 06:52:21 fca -Correct value of drca - -Revision 1.13 1999/10/27 11:16:26 fca -Correction of problem in geometry - -Revision 1.12 1999/10/22 08:25:25 fca -remove double definition of destructors - -Revision 1.11 1999/10/22 08:16:49 fca -Correct destructors, thanks to I.Hrivnacova - -Revision 1.10 1999/10/06 19:56:50 fca -Add destructor - -Revision 1.9 1999/10/05 08:05:09 fca -Minor corrections for uninitialised variables. - -Revision 1.8 1999/09/29 09:24:20 fca -Introduction of the Copyright and cvs Log - -*/ +/* $Id$ */ /////////////////////////////////////////////////////////////////////////////// // // @@ -104,82 +30,64 @@ Introduction of the Copyright and cvs Log // strongly encouraged to uses AliITSv5. // // /////////////////////////////////////////////////////////////////////////////// - +#include #include +#include +#include #include +#include #include +#include #include -#include -#include -#include // only required for Tracking function? -#include -#include -#include +#include - -#include "AliMC.h" #include "AliMagF.h" #include "AliConst.h" - #include "AliITShit.h" #include "AliITSvPPRcoarseasymm.h" +#include "AliMagF.h" #include "AliRun.h" - ClassImp(AliITSvPPRcoarseasymm) //_____________________________________________________________________________ -AliITSvPPRcoarseasymm::AliITSvPPRcoarseasymm() { +AliITSvPPRcoarseasymm::AliITSvPPRcoarseasymm(): +AliITS(), +fMajorVersion(IsVersion()), +fMinorVersion(0), +fRails(0), +fSuppMat(0), +fIgm(kvPPRcourseasymm) { //////////////////////////////////////////////////////////////////////// // Standard default constructor for the ITS version 6. //////////////////////////////////////////////////////////////////////// - fIdN = 6; - fIdName = new TString[fIdN]; - fIdName[0] = "ITS1"; - fIdName[1] = "ITS2"; - fIdName[2] = "ITS3"; - fIdName[3] = "ITS4"; - fIdName[4] = "ITS5"; - fIdName[5] = "ITS6"; - fIdSens = new Int_t[fIdN]; - for (Int_t i=0;iGetGeometry()->GetNode("alice"); - new TTUBE("S_layer1","Layer1 of ITS","void",3.95,3.95+0.05475,12.25); + new TTUBE("S_layer1","Layer1 of ITS","void",3.8095,3.8095+1.03*9.36/100.,14.35); top->cd(); node = new TNode("Layer1","Layer1","S_layer1",0,0,0,""); node->SetLineColor(kColorITS); fNodes->Add(node); - new TTUBE("S_layer2","Layer2 of ITS","void",7.,7.+0.05475,16.3); + new TTUBE("S_layer2","Layer2 of ITS","void",7.,7.+1.03*9.36/100.,14.35); top->cd(); node = new TNode("Layer2","Layer2","S_layer2",0,0,0,""); node->SetLineColor(kColorITS); fNodes->Add(node); - new TTUBE("S_layer3","Layer3 of ITS","void",15.,15.+0.05288,21.1); + new TTUBE("S_layer3","Layer3 of ITS","void",15.,15.+0.94*9.36/100.,25.1); top->cd(); node = new TNode("Layer3","Layer3","S_layer3",0,0,0,""); node->SetLineColor(kColorITS); fNodes->Add(node); - new TTUBE("S_layer4","Layer4 of ITS","void",24,24+0.05288,29.6); + new TTUBE("S_layer4","Layer4 of ITS","void",24.1,24.1+0.95*9.36/100.,32.1); top->cd(); node = new TNode("Layer4","Layer4","S_layer4",0,0,0,""); node->SetLineColor(kColorITS); fNodes->Add(node); - new TTUBE("S_layer5","Layer5 of ITS","void",40,40+0.05382,45.1); + new TTUBE("S_layer5","Layer5 of ITS","void",38.5,38.5+0.91*9.36/100.,49.405); top->cd(); node = new TNode("Layer5","Layer5","S_layer5",0,0,0,""); node->SetLineColor(kColorITS); fNodes->Add(node); - new TTUBE("S_layer6","Layer6 of ITS","void",45,45+0.05382,50.4); + new TTUBE("S_layer6","Layer6 of ITS","void",43.5765,43.5765+0.87*9.36/100.,55.27); top->cd(); node = new TNode("Layer6","Layer6","S_layer6",0,0,0,""); node->SetLineColor(kColorITS); @@ -236,111 +144,190 @@ void AliITSvPPRcoarseasymm::BuildGeometry(){ } //_____________________________________________________________________________ void AliITSvPPRcoarseasymm::CreateGeometry(){ -//////////////////////////////////////////////////////////////////////// -// This routine defines and Creates the geometry for version 6 of the ITS. -//////////////////////////////////////////////////////////////////////// - - //INNER RADII OF THE SILICON LAYERS - Float_t rl[6] = { 3.8095,7.,15.,24.,38.1,43.5765 }; - //THICKNESSES OF LAYERS (in % radiation length) - Float_t drl[6] = { 1.03,1.03,0.94,0.95,0.91,0.87 }; - //HALF LENGTHS OF LAYERS - Float_t dzl[6] = { 14.35,14.35,25.1,32.1,49.405,55.27 }; - //LENGTHS OF END-LADDER BOXES (ALL INCLUDED) - Float_t dzb[6] = { 12.4,12.4,13.5,15.,7.5,7.5 }; - //THICKNESSES OF END-LADDER BOXES (ALL INCLUDED) - Float_t drb[6] = { rl[1]-rl[0],0.2,5.,5.,4.,4. }; + //////////////////////////////////////////////////////////////////////// + // This routine defines and Creates the geometry for version 6 of the ITS. + //////////////////////////////////////////////////////////////////////// + + //INNER RADII OF THE SILICON LAYERS + Float_t rl[6] = { 3.8095,7.,15.,24.,38.5,43.5765 }; + //THICKNESSES OF LAYERS (in % radiation length) + Float_t drl[6] = { 1.03,1.03,0.94,0.95,0.91,0.87 }; + //HALF LENGTHS OF LAYERS + Float_t dzl[6] = { 14.35,14.35,25.1,32.1,49.405,55.27 }; + //LENGTHS OF END-LADDER BOXES (ALL INCLUDED) + Float_t dzb[6] = { 12.4,12.4,13.5,15.,7.5,7.5 }; + //THICKNESSES OF END-LADDER BOXES (ALL INCLUDED) + Float_t drb[6] = { rl[1]-rl[0],0.2,5.,5.,4.,4. }; - Float_t dits[3], rlim, zmax; - Float_t zpos; - Float_t pcits[15], xltpc; - Int_t idrotm[399], i; - Float_t dgh[50]; - - Int_t *idtmed = fIdtmed->GetArray()-199; - - // CONVERT INTO CM (RL(SI)=9.36 CM) - for (i = 0; i < 6; ++i) { - drl[i] = drl[i] / 100. * 9.36; - } - - // FIELD CAGE HALF LENGTH - - rlim = 56.; - zmax = 76.708; - xltpc = 284.; - - // --- Define ghost volume containing the whole ITS (including services) - // and fill it with air - - dgh[0] = 0.; - dgh[1] = 360.; - dgh[2] = 12.; - dgh[3] = -xltpc-5.-0.1; - dgh[4] = 44.9; - dgh[5] = 85.; - dgh[6] = -xltpc; - dgh[7] = 44.9; - dgh[8] = 85.; - dgh[9] = -xltpc; - dgh[10] = 44.9; - dgh[11] = 56.1; - dgh[12] = -100.7; - dgh[13] = 44.9; - dgh[14] = 56.1; - dgh[15] = -77.2; - dgh[16] = 44.9; - dgh[17] = 56.1; - dgh[18] = -40.; - dgh[19] = 3.295; - dgh[20] = 56.1; - dgh[21] = 40.; - dgh[22] = 3.295; - dgh[23] = 56.1; - dgh[24] = 77.2; - dgh[25] = 44.9; - dgh[26] = 56.1; - dgh[27] = 100.7; - dgh[28] = 44.9; - dgh[29] = 56.1; - dgh[30] = xltpc; - dgh[31] = 61.5; - dgh[32] = 61.5+4.; - dgh[33] = xltpc; - dgh[34] = 61.5; - dgh[35] = 85.; - dgh[36] = xltpc+4.+0.1; - dgh[37] = 62.4; - dgh[38] = 85.; + Float_t dits[3], rlim, zmax; + Float_t zpos; + Float_t pcits[100], ztpc; + Int_t idrotm[1999], i; + Float_t dgh[100]; + + Int_t rails = 1; // flag for rails (1 --> rails in; 0 --> rails out) + Int_t suppmat = 0; // flag to change the material of the services + // supports (=0 copper, =1 aluminum, =2 carbon) + // These constant character strings are set by cvs during commit + // do not change them unless you know what you are doing! + const Char_t *cvsDate="$Date$"; + const Char_t *cvsRevision="$Revision$"; + rails = GetRails(); + + if(rails != 0 && rails != 1) { + cout << "ITS - WARNING: the switch for rails is not set " + "neither to 0 (rails out) nor to 1 (rails in)." + " The default value of 1 (rails in) will be used." << endl; + } // end if + + if (rails == 0 ) { + cout << "ITS: Rails are out." << endl; + } else { + cout << "ITS: Rails are in." << endl; + } // end if + suppmat = GetSupportMaterial(); + + if (suppmat != 0 && suppmat != 1 && suppmat != 2) { + cout << "ITS - WARNING: the flag for the material of " + "services supports is not set neither to 0 (copper) " + "nor to 1 (aluminum) nor to 2 (carbon)." + " The default value of 0 (copper) will be used." << endl; + } // end if + + if (suppmat == 0) { + cout << "ITS: The material of the services supports is copper." + << endl; + } else if (suppmat == 1){ + cout << "ITS: The material of the services supports is aluminum." + << endl; + } else { + cout << "ITS: The material of the services supports is carbon." + << endl; + } // end if + - gMC->Gsvolu("ITSV", "PCON", idtmed[275], dgh, 39); + Int_t *idtmed = fIdtmed->GetArray()-199; - // --- Place the ghost volume in its mother volume (ALIC) and make it - // invisible - - gMC->Gspos("ITSV", 1, "ALIC", 0., 0., 0., 0, "ONLY"); - gMC->Gsatt("ITSV", "SEEN", 0); + // CONVERT INTO CM (RL(SI)=9.36 CM) + for (i = 0; i < 6; ++i) { + drl[i] = drl[i] / 100. * 9.36; + } // end if + + // FIELD CAGE HALF LENGTH + + rlim = 50.; + zmax = 74.; + ztpc = 284.; + + // --- Define ghost volume containing the whole ITS (including services) + // and fill it with air + /* + dgh[0] = 0.; + dgh[1] = 360.; + dgh[2] = 16.; + dgh[3] = -ztpc-5.-0.1; + dgh[4] = 46; + dgh[5] = 85.; + dgh[6] = -ztpc; + dgh[7] = 46; + dgh[8] = 85.; + dgh[9] = -ztpc; + dgh[10] = 46; + dgh[11] = rlim+6; + dgh[12] = -97.5; + dgh[13] = 46; + dgh[14] = rlim+6; + dgh[15] = -zmax; + dgh[16] = 46; + dgh[17] = rlim+6; + dgh[18] = -48; + dgh[19] = 6; + dgh[20] = rlim+6; + dgh[21] = -28.6; + dgh[22] = 6; + dgh[23] = rlim+6; + dgh[24] = -27.6; + dgh[25] = 3.295; + dgh[26] = rlim+6; + dgh[27] = 27.6; + dgh[28] = 3.295; + dgh[29] = rlim+6; + dgh[30] = 28.6; + dgh[31] = 6; + dgh[32] = rlim+6; + dgh[33] = 48; + dgh[34] = 6; + dgh[35] = rlim+6; + dgh[36] = zmax; + dgh[37] = 46; + dgh[38] = rlim+6; + dgh[39] = 97.5; + dgh[40] = 46; + dgh[41] = rlim+6; + dgh[42] = ztpc; + dgh[43] = 62; + dgh[44] = 62+4.; + dgh[45] = ztpc; + dgh[46] = 62; + dgh[47] = 85.; + dgh[48] = ztpc+4.+0.1; + dgh[49] = 62.4; + dgh[50] = 85.; + gMC->Gsvolu("ITSV", "PCON", idtmed[275], dgh, 51); + + // --- Place the ghost volume in its mother volume (ALIC) and make it + // invisible + + gMC->Gspos("ITSV", 1, "ALIC", 0., 0., 0., 0, "ONLY"); + //gMC->Gsatt("ITSV", "SEEN", 0); + */ + TGeoVolumeAssembly *itsV = gGeoManager->MakeVolumeAssembly("ITSV"); + const Int_t length=100; + Char_t vstrng[length]; + if(fIgm.WriteVersionString(vstrng,length,(AliITSVersion_t)IsVersion(), + fMinorVersion,cvsDate,cvsRevision)) + itsV->SetTitle(vstrng); + TGeoVolume *alic = gGeoManager->GetVolume("ALIC"); + if(alic==0) { + Error("CreateGeometry","alic=0"); + return; + } // end if + // See idrotm[199] for angle definitions. + //alic->AddNode(itsV,1,new TGeoRotation("", 90.,180., 90.,90., 180.,0.)); + alic->AddNode(itsV,1,0); - // --- Define ghost volume containing the six layers and fill it with air + // --- Define ghost volume containing the six layers and fill it with air dgh[0] = 0.; dgh[1] = 360.; - dgh[2] = 4.; - dgh[3] = -77.2; - dgh[4] = 45.; - dgh[5] = 56.; - dgh[6] = -40.; - dgh[7] = 3.3; - dgh[8] = 56.; - dgh[9] = 40.; - dgh[10] = 3.3; - dgh[11] = 56.; - dgh[12] = 77.2; - dgh[13] = 45.; - dgh[14] = 56.; - gMC->Gsvolu("ITSD", "PCON", idtmed[275], dgh, 15); + dgh[2] = 8.; + dgh[3] = -zmax; + dgh[4] = 46.; + dgh[5] = rlim; + dgh[6] = -47.5; + dgh[7] = 6.005; + dgh[8] = rlim; + dgh[9] = -28.5; + dgh[10] = 6.005; + dgh[11] = rlim; + dgh[12] = -27.5; + dgh[13] = 3.3; + dgh[14] = rlim; + dgh[15] = 27.5; + dgh[16] = 3.3; + dgh[17] = rlim; + dgh[18] = 28.5; + dgh[19] = 6.005; + dgh[20] = rlim; + dgh[21] = 47.5; + dgh[22] = 6.005; + dgh[23] = rlim; + dgh[24] = zmax; + dgh[25] = 46.; + dgh[26] = rlim; + gMC->Gsvolu("ITSD", "PCON", idtmed[275], dgh, 27); // --- Place the ghost volume in its mother volume (ITSV) and make it // invisible @@ -348,6 +335,7 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){ gMC->Gspos("ITSD", 1, "ITSV", 0., 0., 0., 0, "ONLY"); //gMC->Gsatt("ITSD", "SEEN", 0); + // ITS LAYERS (SILICON) dits[0] = rl[0]; @@ -475,222 +463,338 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){ pcits[4] = 47.+0.1; gMC->Gsvolu("ICO2", "CONE", idtmed[264], pcits, 5); gMC->Gspos("ICO2", 1, "ITSD", 0., 0., 59.+pcits[0], 0, "ONLY"); + gMC->Gspos("ICO2", 2, "ITSD", 0., 0., -(59.+pcits[0]), idrotm[200], "ONLY"); - // SERVICES + // **************************** SERVICES ********************************* + + + // --- DEFINE CABLES AT THE END OF THE ITS CONES - COPPER PART + // UPPER PART - dgh[0] = 45.; - dgh[1] = 45.+1.0; + dgh[0] = 46.; + dgh[1] = 46.+1.0; dgh[2] = 9.5; + dgh[3] = 12.; + dgh[4] = 168.; + + if (suppmat == 0) { + gMC->Gsvolu("I1CU", "TUBS", idtmed[279], dgh, 5); // copper + } else if (suppmat == 1) { + gMC->Gsvolu("I1CU", "TUBS", idtmed[285], dgh, 5); // aluminum + } else { + gMC->Gsvolu("I1CU", "TUBS", idtmed[274], dgh, 5); // carbon + } + gMC->Gspos("I1CU", 1, "ITSV", 0., 0., 83.5, 0, "ONLY"); + gMC->Gspos("I1CU", 2, "ITSV", 0., 0., -83.5, idrotm[200], "ONLY"); - gMC->Gsvolu("ICCU", "TUBE", idtmed[279], dgh, 3); - gMC->Gspos("ICCU", 1, "ITSV", 0., 0., 86.7, 0, "ONLY"); - gMC->Gspos("ICCU", 2, "ITSV", 0., 0., -86.7, idrotm[200], "ONLY"); + // --- DEFINE CABLES AT THE END OF THE ITS CONES - COPPER PART + // LOWER PART + + dgh[0] = 46.; + dgh[1] = 46.+1.0; + dgh[2] = 9.5; + dgh[3] = 192.; + dgh[4] = 348.; + if (suppmat == 0) { + gMC->Gsvolu("I2CU", "TUBS", idtmed[279], dgh, 5); // copper + } else if (suppmat == 1) { + gMC->Gsvolu("I2CU", "TUBS", idtmed[285], dgh, 5); // aluminum + } else { + gMC->Gsvolu("I2CU", "TUBS", idtmed[274], dgh, 5); // carbon + } + gMC->Gspos("I2CU", 1, "ITSV", 0., 0., 83.5, 0, "ONLY"); + gMC->Gspos("I2CU", 2, "ITSV", 0., 0., -83.5, idrotm[200], "ONLY"); + + // --- DEFINE CABLES AT THE END OF THE ITS CONES - CARBON PART + // UPPER PART - dgh[0] = 45.+1.0; - dgh[1] = 45.+1.0+1.5; + dgh[0] = 46.+1.0; + dgh[1] = 46.+1.0+1.5; dgh[2] = 9.5; + dgh[3] = 12.; + dgh[4] = 168.; - gMC->Gsvolu("ICCC", "TUBE", idtmed[274], dgh, 3); - gMC->Gspos("ICCC", 1, "ITSV", 0., 0., 86.7, 0, "ONLY"); - gMC->Gspos("ICCC", 2, "ITSV", 0., 0., -86.7, idrotm[200], "ONLY"); + gMC->Gsvolu("I1CC", "TUBS", idtmed[274], dgh, 5); + gMC->Gspos("I1CC", 1, "ITSV", 0., 0., 83.5, 0, "ONLY"); + gMC->Gspos("I1CC", 2, "ITSV", 0., 0., -83.5, idrotm[200], "ONLY"); - // --- DEFINE PATCH PANELS AT THE END OF THE ITS CONES + // --- DEFINE CABLES AT THE END OF THE ITS CONES - CARBON PART + // LOWER PART - dgh[0] = 45.; + dgh[0] = 46.+1.0; + dgh[1] = 46.+1.0+1.5; + dgh[2] = 9.5; + dgh[3] = 192.; + dgh[4] = 348.; + + gMC->Gsvolu("I2CC", "TUBS", idtmed[274], dgh, 5); + gMC->Gspos("I2CC", 1, "ITSV", 0., 0., 83.5, 0, "ONLY"); + gMC->Gspos("I2CC", 2, "ITSV", 0., 0., -83.5, idrotm[200], "ONLY"); + + // --- DEFINE PATCH PANELS AT THE END OF THE ITS CONES + // UPPER PART + + dgh[0] = 46.; dgh[1] = 56.; dgh[2] = 2.25; + dgh[3] = 12.; + dgh[4] = 168.; - gMC->Gsvolu("IPAN", "TUBE", idtmed[285], dgh, 3); - gMC->Gspos("IPAN", 1, "ITSV", 0., 0., 98.45, 0, "ONLY"); - gMC->Gspos("IPAN", 2, "ITSV", 0., 0., -98.45, idrotm[200], "ONLY"); + gMC->Gsvolu("IPA1", "TUBS", idtmed[285], dgh, 5); + gMC->Gspos("IPA1", 1, "ITSV", 0., 0., 95.25, 0, "ONLY"); + gMC->Gspos("IPA1", 2, "ITSV", 0., 0., -95.25, idrotm[200], "ONLY"); + + + // --- DEFINE PATCH PANELS AT THE END OF THE ITS CONES + // LOWER PART + + dgh[0] = 46.; + dgh[1] = 56.; + dgh[2] = 2.25; + dgh[3] = 192.; + dgh[4] = 348.; + gMC->Gsvolu("IPA2", "TUBS", idtmed[285], dgh, 5); + gMC->Gspos("IPA2", 1, "ITSV", 0., 0., 95.25, 0, "ONLY"); + gMC->Gspos("IPA2", 2, "ITSV", 0., 0., -95.25, idrotm[200], "ONLY"); + + // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE ABSORBER SIDE - COPPER PART // UPPER PART - dgh[0] = (xltpc-100.7)/2.; - dgh[1] = 45.2; - dgh[2] = 45.2+1.0; - dgh[3] = 61.8; - dgh[4] = 61.8+1.0; + dgh[0] = (ztpc-97.5)/2.; + dgh[1] = 46.2; + dgh[2] = 46.2+1.0; + dgh[3] = 62.3; + dgh[4] = 62.3+1.0; dgh[5] = 12.; dgh[6] = 168.; - gMC->Gsvolu("ICU1", "CONS", idtmed[279], dgh, 7); - gMC->Gspos("ICU1", 1, "ITSV", 0., 0., 100.7+dgh[0], 0, "ONLY"); + if (suppmat == 0) { + gMC->Gsvolu("ICU1", "CONS", idtmed[279], dgh, 7); // copper + } else if (suppmat == 1) { + gMC->Gsvolu("ICU1", "CONS", idtmed[285], dgh, 7); // aluminum + } else { + gMC->Gsvolu("ICU1", "CONS", idtmed[274], dgh, 7); // carbon + } + gMC->Gspos("ICU1", 1, "ITSV", 0., 0., 97.5+dgh[0], 0, "ONLY"); // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE ABSORBER SIDE - COPPER PART // LOWER PART - dgh[0] = (xltpc-100.7)/2.; - dgh[1] = 45.2; - dgh[2] = 45.2+1.0; - dgh[3] = 61.8; - dgh[4] = 61.8+1.0; + dgh[0] = (ztpc-97.5)/2.; + dgh[1] = 46.2; + dgh[2] = 46.2+1.0; + dgh[3] = 62.3; + dgh[4] = 62.3+1.0; dgh[5] = 192.; dgh[6] = 348.; - gMC->Gsvolu("ICU2", "CONS", idtmed[279], dgh, 7); - gMC->Gspos("ICU2", 1, "ITSV", 0., 0., 100.7+dgh[0], 0, "ONLY"); + if (suppmat == 0) { + gMC->Gsvolu("ICU2", "CONS", idtmed[279], dgh, 7); // copper + } else if (suppmat == 1) { + gMC->Gsvolu("ICU2", "CONS", idtmed[285], dgh, 7); // aluminum + } else { + gMC->Gsvolu("ICU2", "CONS", idtmed[274], dgh, 7); // carbon + } + gMC->Gspos("ICU2", 1, "ITSV", 0., 0., 97.5+dgh[0], 0, "ONLY"); + // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE ABSORBER SIDE - CARBON PART // UPPER PART - dgh[0] = (xltpc-100.7)/2.; - dgh[1] = 45.2+1.0; - dgh[2] = 45.2+1.0+1.5; - dgh[3] = 61.8+1.0; - dgh[4] = 61.8+1.0+1.5; + dgh[0] = (ztpc-97.5)/2.; + dgh[1] = 46.2+1.0; + dgh[2] = 46.2+1.0+1.5; + dgh[3] = 62.3+1.0; + dgh[4] = 62.3+1.0+1.5; dgh[5] = 12.; dgh[6] = 168.; gMC->Gsvolu("ICC1", "CONS", idtmed[274], dgh, 7); - gMC->Gspos("ICC1", 1, "ITSV", 0., 0., 100.7+dgh[0], 0, "ONLY"); + gMC->Gspos("ICC1", 1, "ITSV", 0., 0., 97.5+dgh[0], 0, "ONLY"); // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE ABSORBER SIDE - CARBON PART // LOWER PART - dgh[0] = (xltpc-100.7)/2.; - dgh[1] = 45.2+1.0; - dgh[2] = 45.2+1.0+1.5; - dgh[3] = 61.8+1.0; - dgh[4] = 61.8+1.0+1.5; + dgh[0] = (ztpc-97.5)/2.; + dgh[1] = 46.2+1.0; + dgh[2] = 46.2+1.0+1.5; + dgh[3] = 62.3+1.0; + dgh[4] = 62.3+1.0+1.5; dgh[5] = 192.; dgh[6] = 348.; gMC->Gsvolu("ICC2", "CONS", idtmed[274], dgh, 7); - gMC->Gspos("ICC2", 1, "ITSV", 0., 0., 100.7+dgh[0], 0, "ONLY"); + gMC->Gspos("ICC2", 1, "ITSV", 0., 0., 97.5+dgh[0], 0, "ONLY"); // --- DEFINE CABLES/COOLING BEHIND THE TPC ON THE ABSORBER SIDE - COPPER PART // UPPER PART - dgh[0] = 62.5; + dgh[0] = 62.1; dgh[1] = 74.5; dgh[2] = 0.5; dgh[3] = 12.; dgh[4] = 168.; - gMC->Gsvolu("ICU3", "TUBS", idtmed[279], dgh, 5); - gMC->Gspos("ICU3", 1, "ITSV", 0., 0., xltpc+1.5+dgh[2], 0, "ONLY"); + if (suppmat == 0) { + gMC->Gsvolu("ICU3", "TUBS", idtmed[279], dgh, 5); // copper + } else if (suppmat == 1) { + gMC->Gsvolu("ICU3", "TUBS", idtmed[285], dgh, 5); // aluminum + } else { + gMC->Gsvolu("ICU3", "TUBS", idtmed[274], dgh, 5); // carbon + } + gMC->Gspos("ICU3", 1, "ITSV", 0., 0., ztpc+1.5+dgh[2], 0, "ONLY"); // --- DEFINE CABLES/COOLING BEHIND THE TPC ON THE ABSORBER SIDE - COPPER PART // LOWER PART - dgh[0] = 62.5; + dgh[0] = 62.1; dgh[1] = 74.5; dgh[2] = 0.5; dgh[3] = 192.; dgh[4] = 348.; - gMC->Gsvolu("ICU4", "TUBS", idtmed[279], dgh, 5); - gMC->Gspos("ICU4", 1, "ITSV", 0., 0., xltpc+1.5+dgh[2], 0, "ONLY"); + if (suppmat == 0) { + gMC->Gsvolu("ICU4", "TUBS", idtmed[279], dgh, 5); // copper + } else if (suppmat == 1) { + gMC->Gsvolu("ICU4", "TUBS", idtmed[285], dgh, 5); // aluminum + } else { + gMC->Gsvolu("ICU4", "TUBS", idtmed[274], dgh, 5); // carbon + } + gMC->Gspos("ICU4", 1, "ITSV", 0., 0., ztpc+1.5+dgh[2], 0, "ONLY"); // --- DEFINE CABLES/COOLING BEHIND THE TPC ON THE ABSORBER SIDE - CARBON PART // UPPER PART - dgh[0] = 62.5; + dgh[0] = 62.1; dgh[1] = 74.5; dgh[2] = 0.75; dgh[3] = 12.; dgh[4] = 168.; gMC->Gsvolu("ICC3", "TUBS", idtmed[274], dgh, 5); - gMC->Gspos("ICC3", 1, "ITSV", 0., 0., xltpc+dgh[2], 0, "ONLY"); + gMC->Gspos("ICC3", 1, "ITSV", 0., 0., ztpc+dgh[2], 0, "ONLY"); // --- DEFINE CABLES/COOLING BEHIND THE TPC ON THE ABSORBER SIDE - CARBON PART // LOWER PART - dgh[0] = 62.5; + dgh[0] = 62.1; dgh[1] = 74.5; dgh[2] = 0.75; dgh[3] = 192.; dgh[4] = 348.; gMC->Gsvolu("ICC4", "TUBS", idtmed[274], dgh, 5); - gMC->Gspos("ICC4", 1, "ITSV", 0., 0., xltpc+dgh[2], 0, "ONLY"); + gMC->Gspos("ICC4", 1, "ITSV", 0., 0., ztpc+dgh[2], 0, "ONLY"); // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE OTHER SIDE W.R.T. // THE ABSORBER - COPPER PART - UPPER PART - dgh[0] = 45.; - dgh[1] = 45.+1.0; - dgh[2] = (xltpc-100.7+1.5)/2.; + dgh[0] = 46.; + dgh[1] = 46.+1.0; + dgh[2] = (ztpc-97.5+1.5)/2.; dgh[3] = 12.; dgh[4] = 168.; - gMC->Gsvolu("ICU5", "TUBS", idtmed[279], dgh, 5); - gMC->Gspos("ICU5", 1, "ITSV", 0., 0., -100.7-dgh[2], 0, "ONLY"); + if (suppmat == 0) { + gMC->Gsvolu("ICU5", "TUBS", idtmed[279], dgh, 5); // copper + } else if (suppmat == 1) { + gMC->Gsvolu("ICU5", "TUBS", idtmed[285], dgh, 5); // aluminum + } else { + gMC->Gsvolu("ICU5", "TUBS", idtmed[274], dgh, 5); // carbon + } + gMC->Gspos("ICU5", 1, "ITSV", 0., 0., -97.5-dgh[2], 0, "ONLY"); // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE OTHER SIDE W.R.T. // THE ABSORBER - COPPER PART - LOWER PART - dgh[0] = 45.; - dgh[1] = 45.+1.0; - dgh[2] = (xltpc-100.7+1.5)/2.; + dgh[0] = 46.; + dgh[1] = 46.+1.0; + dgh[2] = (ztpc-97.5+1.5)/2.; dgh[3] = 192.; dgh[4] = 348.; - gMC->Gsvolu("ICU6", "TUBS", idtmed[279], dgh, 5); - gMC->Gspos("ICU6", 1, "ITSV", 0., 0., -100.7-dgh[2], 0, "ONLY"); + if (suppmat == 0) { + gMC->Gsvolu("ICU6", "TUBS", idtmed[279], dgh, 5); // copper + } else if (suppmat == 1) { + gMC->Gsvolu("ICU6", "TUBS", idtmed[285], dgh, 5); // aluminum + } else { + gMC->Gsvolu("ICU6", "TUBS", idtmed[274], dgh, 5); // carbon + } + gMC->Gspos("ICU6", 1, "ITSV", 0., 0., -97.5-dgh[2], 0, "ONLY"); // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE OTHER SIDE W.R.T. // THE ABSORBER - CARBON PART - UPPER PART - dgh[0] = 45.+1.0; - dgh[1] = 45.+1.0+1.5; - dgh[2] = (xltpc-100.7)/2.; + dgh[0] = 46.+1.0; + dgh[1] = 46.+1.0+1.5; + dgh[2] = (ztpc-97.5)/2.; dgh[3] = 12.; dgh[4] = 168.; gMC->Gsvolu("ICC5", "TUBS", idtmed[274], dgh, 5); - gMC->Gspos("ICC5", 1, "ITSV", 0., 0., -100.7-dgh[2], 0, "ONLY"); + gMC->Gspos("ICC5", 1, "ITSV", 0., 0., -97.5-dgh[2], 0, "ONLY"); // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE OTHER SIDE W.R.T. // THE ABSORBER - CARBON PART - LOWER PART - dgh[0] = 45.+1.0; - dgh[1] = 45.+1.0+1.5; - dgh[2] = (xltpc-100.7)/2.; + dgh[0] = 46.+1.0; + dgh[1] = 46.+1.0+1.5; + dgh[2] = (ztpc-97.5)/2.; dgh[3] = 192.; dgh[4] = 348.; gMC->Gsvolu("ICC6", "TUBS", idtmed[274], dgh, 5); - gMC->Gspos("ICC6", 1, "ITSV", 0., 0., -100.7-dgh[2], 0, "ONLY"); + gMC->Gspos("ICC6", 1, "ITSV", 0., 0., -97.5-dgh[2], 0, "ONLY"); // --- DEFINE CABLES/COOLING BEHIND THE TPC ON OTHER SIDE W.R.T. THE ABSORBER // COPPER PART - UPPER PART - dgh[0] = 45.; + dgh[0] = 46.; dgh[1] = 74.5; dgh[2] = 0.5; dgh[3] = 12.; dgh[4] = 168.; - gMC->Gsvolu("ICU7", "TUBS", idtmed[279], dgh, 5); - gMC->Gspos("ICU7", 1, "ITSV", 0., 0., -(xltpc+1.5+dgh[2]), 0, "ONLY"); + if (suppmat == 0) { + gMC->Gsvolu("ICU7", "TUBS", idtmed[279], dgh, 5); // copper + } else if (suppmat == 1) { + gMC->Gsvolu("ICU7", "TUBS", idtmed[285], dgh, 5); // aluminum + } else { + gMC->Gsvolu("ICU7", "TUBS", idtmed[274], dgh, 5); // carbon + } + gMC->Gspos("ICU7", 1, "ITSV", 0., 0., -(ztpc+1.5+dgh[2]), 0, "ONLY"); // --- DEFINE CABLES/COOLING BEHIND THE TPC ON OTHER SIDE W.R.T. THE ABSORBER // COPPER PART - LOWER PART - dgh[0] = 45.; + dgh[0] = 46.; dgh[1] = 74.5; dgh[2] = 0.5; dgh[3] = 192.; dgh[4] = 348.; - gMC->Gsvolu("ICU8", "TUBS", idtmed[279], dgh, 5); - gMC->Gspos("ICU8", 1, "ITSV", 0., 0., -(xltpc+1.5+dgh[2]), 0, "ONLY"); + if (suppmat == 0) { + gMC->Gsvolu("ICU8", "TUBS", idtmed[279], dgh, 5); // copper + } else if (suppmat == 1) { + gMC->Gsvolu("ICU8", "TUBS", idtmed[285], dgh, 5); // aluminum + } else { + gMC->Gsvolu("ICU8", "TUBS", idtmed[274], dgh, 5); // carbon + } + gMC->Gspos("ICU8", 1, "ITSV", 0., 0., -(ztpc+1.5+dgh[2]), 0, "ONLY"); // --- DEFINE CABLES/COOLING BEHIND THE TPC ON OTHER SIDE W.R.T. THE ABSORBER // CARBON PART - UPPER PART - dgh[0] = 45.+1.0; + dgh[0] = 46.+1.0; dgh[1] = 74.5; dgh[2] = 0.75; dgh[3] = 12.; dgh[4] = 168.; gMC->Gsvolu("ICC7", "TUBS", idtmed[274], dgh, 5); - gMC->Gspos("ICC7", 1, "ITSV", 0., 0., -(xltpc+dgh[2]), 0, "ONLY"); + gMC->Gspos("ICC7", 1, "ITSV", 0., 0., -(ztpc+dgh[2]), 0, "ONLY"); // --- DEFINE CABLES/COOLING BEHIND THE TPC ON OTHER SIDE W.R.T. THE ABSORBER // CARBON PART - LOWER PART - dgh[0] = 45.+1.0; + dgh[0] = 46.+1.0; dgh[1] = 74.5; dgh[2] = 0.75; dgh[3] = 192.; dgh[4] = 348.; gMC->Gsvolu("ICC8", "TUBS", idtmed[274], dgh, 5); - gMC->Gspos("ICC8", 1, "ITSV", 0., 0., -(xltpc+dgh[2]), 0, "ONLY"); + gMC->Gspos("ICC8", 1, "ITSV", 0., 0., -(ztpc+dgh[2]), 0, "ONLY"); // --- DEFINE HOOK TO THE TPC ON OTHER SIDE W.R.T. THE ABSORBER - UPPER PART @@ -700,7 +804,7 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){ dgh[3] = 12.; dgh[4] = 168.; gMC->Gsvolu("IHK1", "TUBS", idtmed[284], dgh, 5); - gMC->Gspos("IHK1", 1, "ITSV", 0., 0., -xltpc-dgh[2], 0, "ONLY"); + gMC->Gspos("IHK1", 1, "ITSV", 0., 0., -ztpc-dgh[2], 0, "ONLY"); // --- DEFINE HOOK TO THE TPC ON OTHER SIDE W.R.T. THE ABSORBER - LOWER PART @@ -710,26 +814,83 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){ dgh[3] = 192.; dgh[4] = 348.; gMC->Gsvolu("IHK2", "TUBS", idtmed[284], dgh, 5); - gMC->Gspos("IHK2", 1, "ITSV", 0., 0., -xltpc-dgh[2], 0, "ONLY"); + gMC->Gspos("IHK2", 1, "ITSV", 0., 0., -ztpc-dgh[2], 0, "ONLY"); // --- DEFINE RAILS BETWEEN THE ITS AND THE TPC - //dgh[0] = 0.85; - //dgh[1] = 10.; - //dgh[2] = 190.; - //gMC->Gsvolu("IRAI", "BOX ", idtmed[285], dgh, 3); - //gMC->Gspos("IRAI", 1, "ITSV", 53., 0., -69.5, 0, "ONLY"); - //gMC->Gspos("IRAI", 2, "ITSV", -53., 0., -69.5, 0, "ONLY"); + if (rails == 1) { + + dgh[0] = 2.; + dgh[1] = 8.; + dgh[2] = 190.; + gMC->Gsvolu("IRA1", "BOX ", idtmed[239], dgh, 3); + gMC->Gspos("IRA1", 1, "ITSV", 53.5, 0., -69.5, 0, "ONLY"); + gMC->Gsvolu("IRA2", "BOX ", idtmed[239], dgh, 3); + gMC->Gspos("IRA2", 1, "ITSV", -53.5, 0., -69.5, 0, "ONLY"); + + dgh[0] = 2.-0.5; // 0.5 was determined in such a way that the aluminum area is 20.9 cm^2 + dgh[1] = 8.-0.5; // 0.5 was determined in such a way that the aluminum area is 20.9 cm^2 + dgh[2] = 190.; + gMC->Gsvolu("IRA3", "BOX ", idtmed[275], dgh, 3); + gMC->Gspos("IRA3", 1, "IRA1", 0., 0., 0., 0, "ONLY"); + gMC->Gsvolu("IRA4", "BOX ", idtmed[275], dgh, 3); + gMC->Gspos("IRA4", 1, "IRA2", 0., 0., 0., 0, "ONLY"); + + } // --- DEFINE CYLINDERS HOLDING RAILS BETWEEN THE ITS AND THE TPC - dgh[0] = 58.; + dgh[0] = 56.9; dgh[1] = 59.; dgh[2] = 0.6; gMC->Gsvolu("ICYL", "TUBE", idtmed[285], dgh, 3); - gMC->Gspos("ICYL", 1, "ALIC", 0., 0., 74., 0, "ONLY"); - gMC->Gspos("ICYL", 2, "ALIC", 0., 0., -74., idrotm[200], "ONLY"); - + gMC->Gspos("ICYL", 1, "ALIC", 0., 0., 74.1, 0, "ONLY"); + gMC->Gspos("ICYL", 2, "ALIC", 0., 0., -74.1, idrotm[200], "ONLY"); + + // --- DEFINE SUPPORTS FOR RAILS ATTACHED TO THE CYLINDERS + + dgh[0] = 0.; + dgh[1] = 3.; + dgh[2] = 5.; // 5. comes from the fact that the volume has to be 567.6/2 cm^3 + gMC->Gsvolu("ISR1", "TUBE", idtmed[286], dgh, 3); + gMC->Gspos("ISR1", 1, "ITSV", 53.4292, 10.7053, 79.75, 0, "ONLY"); + gMC->Gspos("ISR1", 2, "ITSV", 53.4292, -10.7053, 79.75, 0, "ONLY"); + gMC->Gspos("ISR1", 3, "ITSV", -53.4292, 10.7053, 79.75, 0, "ONLY"); + gMC->Gspos("ISR1", 4, "ITSV", -53.4292, -10.7053, 79.75, 0, "ONLY"); + gMC->Gspos("ISR1", 5, "ITSV", 53.4292, 10.7053, -79.75, 0, "ONLY"); + gMC->Gspos("ISR1", 6, "ITSV", 53.4292, -10.7053, -79.75, 0, "ONLY"); + gMC->Gspos("ISR1", 7, "ITSV", -53.4292, 10.7053, -79.75, 0, "ONLY"); + gMC->Gspos("ISR1", 8, "ITSV", -53.4292, -10.7053, -79.75, 0, "ONLY"); + + // --- DEFINE SUPPORTS FOR RAILS ATTACHED TO THE ABSORBER + + dgh[0] = 5.; + dgh[1] = 12.; + dgh[2] = 5.; + gMC->Gsvolu("ISR2", "BOX ", idtmed[285], dgh, 3); + gMC->Gspos("ISR2", 1, "ALIC", 53.5, 0., 125.5, 0, "ONLY"); + gMC->Gsvolu("ISR3", "BOX ", idtmed[285], dgh, 3); + gMC->Gspos("ISR3", 1, "ALIC", -53.5, 0., 125.5, 0, "ONLY"); + + dgh[0] = 5.-2.; + dgh[1] = 12.-2.; + dgh[2] = 5.; + gMC->Gsvolu("ISR4", "BOX ", idtmed[275], dgh, 3); + gMC->Gspos("ISR4", 1, "ISR2", 0., 0., 0., 0, "ONLY"); + gMC->Gsvolu("ISR5", "BOX ", idtmed[275], dgh, 3); + gMC->Gspos("ISR5", 1, "ISR3", 0., 0., 0., 0, "ONLY"); + + // --- DEFINE SUPPORTS TO ATTACH THE ITS TO THE TPC + + dgh[0] = 0.; + dgh[1] = 5.; + dgh[2] = 2.; + gMC->Gsvolu("ISR6", "TUBE", idtmed[285], dgh, 3); + gMC->Gspos("ISR6", 1, "ALIC", 0., 54., 77., 0, "ONLY"); + gMC->Gspos("ISR6", 2, "ALIC", 0., 54., -77., 0, "ONLY"); + gMC->Gspos("ISR6", 3, "ALIC", 0., -54., -77., 0, "ONLY"); + + // --- Outputs the geometry tree in the EUCLID/CAD format if (fEuclidOut) { @@ -745,7 +906,7 @@ void AliITSvPPRcoarseasymm::CreateMaterials(){ // Monte Carlo simulations for the geometries AliITSv1, AliITSv3, // AliITSvPPRcoarseasymm. // In general it is automatically replaced by - // the CreatMaterials routine defined in AliITSv?. Should the function + // the CreateMaterials routine defined in AliITSv?. Should the function // CreateMaterials not exist for the geometry version you are using this // one is used. See the definition found in AliITSv5 or the other routine // for a complete definition. @@ -795,19 +956,19 @@ void AliITSvPPRcoarseasymm::CreateMaterials(){ // 200-224 --> Silicon Pixel Detectors (detectors, chips, buses, cooling,..) - AliMaterial(0, "SPD Si$", 28.0855, 14., 2.33, 9.36, 999); - AliMaterial(1, "SPD Si chip$", 28.0855, 14., 2.33, 9.36, 999); - AliMaterial(2, "SPD Si bus$", 28.0855, 14., 2.33, 9.36, 999); - AliMaterial(3, "SPD C$", 12.011, 6., 2.265,18.8, 999); + AliMaterial(0, "SPD Si$", 28.0855, 14., 2.33, 9.36, 999.); + AliMaterial(1, "SPD Si chip$", 28.0855, 14., 2.33, 9.36, 999.); + AliMaterial(2, "SPD Si bus$", 28.0855, 14., 2.33, 9.36, 999.); + AliMaterial(3, "SPD C$", 12.011, 6., 2.265,18.8, 999.); // v. dens - AliMaterial(4, "SPD Air$", 14.61, 7.3, .001205, 30423., 999); + AliMaterial(4, "SPD Air$", 14.61, 7.3, .001205, 30423., 999.); AliMaterial(5, "SPD Vacuum$", 1e-16, 1e-16, 1e-16, 1e16, 1e16); - AliMaterial(6, "SPD Al$", 26.981539, 13., 2.6989, 8.9, 999); + AliMaterial(6, "SPD Al$", 26.981539, 13., 2.6989, 8.9, 999.); AliMixture( 7, "SPD Water $", awat, zwat, denswat, -2, wwat); AliMixture( 8, "SPD Freon$", afre, zfre, densfre, -2, wfre); - AliMaterial(9, "SPD End ladder$", 55.845, 26., 7.87/10., 1.76*10., 999); - //AliMaterial(9, "SPD End ladder$", 55.845, 26., -7.87/10., -1.76*10., 999); - AliMaterial(10, "SPD cone$",28.0855, 14., 2.33, 9.36, 999); // check !!!! + AliMaterial(9, "SPD End ladder$", 55.845, 26., 7.87/10., 1.76*10., 999.); + //AliMaterial(9, "SPD End ladder$", 55.845, 26., -7.87/10., -1.76*10., 999.); + AliMaterial(10, "SPD cone$",28.0855, 14., 2.33, 9.36, 999.); // check !!!! // ** AliMedium(0, "SPD Si$", 0, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003); AliMedium(1, "SPD Si chip$", 1, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003); @@ -823,14 +984,14 @@ void AliITSvPPRcoarseasymm::CreateMaterials(){ // 225-249 --> Silicon Drift Detectors (detectors, chips, buses, cooling,..) - AliMaterial(25, "SDD Si$", 28.0855, 14., 2.33, 9.36, 999); - AliMaterial(26, "SDD Si chip$", 28.0855, 14., 2.33, 9.36, 999); - AliMaterial(27, "SDD Si bus$", 28.0855, 14., 2.33, 9.36, 999); - AliMaterial(28, "SDD C$", 12.011, 6., 2.265,18.8, 999); + AliMaterial(25, "SDD Si$", 28.0855, 14., 2.33, 9.36, 999.); + AliMaterial(26, "SDD Si chip$", 28.0855, 14., 2.33, 9.36, 999.); + AliMaterial(27, "SDD Si bus$", 28.0855, 14., 2.33, 9.36, 999.); + AliMaterial(28, "SDD C$", 12.011, 6., 2.265,18.8, 999.); // v. dens - AliMaterial(29, "SDD Air$", 14.61, 7.3, .001205, 30423., 999); + AliMaterial(29, "SDD Air$", 14.61, 7.3, .001205, 30423., 999.); AliMaterial(30, "SDD Vacuum$", 1e-16, 1e-16, 1e-16, 1e16, 1e16); - AliMaterial(31, "SDD Al$", 26.981539, 13., 2.6989, 8.9, 999); + AliMaterial(31, "SDD Al$", 26.981539, 13., 2.6989, 8.9, 999.); // After a call with ratios by number (negative number of elements), // the ratio array is changed to the ratio by weight, so all successive // calls with the same array must specify the number of elements as @@ -842,13 +1003,14 @@ void AliITSvPPRcoarseasymm::CreateMaterials(){ // positive AliMixture( 33, "SDD Freon$", afre, zfre, densfre, 2, wfre); AliMixture( 34, "SDD PCB$", apcb, zpcb, denspcb, 3, wpcb); - AliMaterial(35, "SDD Copper$", 63.546, 29., 8.96, 1.43, 999); + AliMaterial(35, "SDD Copper$", 63.546, 29., 8.96, 1.43, 999.); AliMixture( 36, "SDD Ceramics$", acer, zcer, denscer, -5, wcer); - AliMaterial(37, "SDD Kapton$", 12.011, 6., 1.3, 31.27, 999); - AliMaterial(38, "SDD End ladder$", 69.9298, 29.8246, 0.3824, 36.5103, 999); - AliMaterial(39, "SDD cone$",63.546, 29., 1.15, 1.265, 999); - //AliMaterial(38, "SDD End ladder$", 69.9298, 29.8246, -0.3824, -36.5103, 999); - //AliMaterial(39, "SDD cone$",63.546, 29., -1.15, -1.265, 999); + AliMaterial(37, "SDD Kapton$", 12.011, 6., 1.3, 31.27, 999.); + AliMaterial(38, "SDD End ladder$", 69.9298, 29.8246, 0.3824, 36.5103, 999.); + AliMaterial(39, "SDD cone$",63.546, 29., 1.15, 1.265, 999.); + AliMaterial(40, "SDD M55J$",12.3565, 6.4561, 1.8097, 22.9570, 999.); + //AliMaterial(38, "SDD End ladder$", 69.9298, 29.8246, -0.3824, -36.5103, 999.); + //AliMaterial(39, "SDD cone$",63.546, 29., -1.15, -1.265, 999.); // ** // check A and Z @@ -867,7 +1029,7 @@ void AliITSvPPRcoarseasymm::CreateMaterials(){ AliMedium(37, "SDD Kapton$", 37, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003); AliMedium(38, "SDD End ladder$",38, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003); AliMedium(39, "SDD cone$", 39, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003); - + AliMedium(40, "SDD M55J$", 40, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003); // 250-274 --> Silicon Strip Detectors (detectors, chips, buses, cooling,..) AliMaterial(50, "SSD Si$", 28.0855, 14., 2.33, 9.36, 999.); @@ -875,9 +1037,9 @@ void AliITSvPPRcoarseasymm::CreateMaterials(){ AliMaterial(52, "SSD Si bus$", 28.0855, 14., 2.33, 9.36, 999.); AliMaterial(53, "SSD C$", 12.011, 6., 2.265,18.8, 999.); // v. dens - AliMaterial(54, "SSD Air$", 14.61, 7.3, .001205, 30423., 999); + AliMaterial(54, "SSD Air$", 14.61, 7.3, .001205, 30423., 999.); AliMaterial(55, "SSD Vacuum$", 1e-16, 1e-16, 1e-16, 1e16, 1e16); - AliMaterial(56, "SSD Al$", 26.981539, 13., 2.6989, 8.9, 999); + AliMaterial(56, "SSD Al$", 26.981539, 13., 2.6989, 8.9, 999.); // After a call with ratios by number (negative number of elements), // the ratio array is changed to the ratio by weight, so all successive // calls with the same array must specify the number of elements as @@ -894,14 +1056,14 @@ void AliITSvPPRcoarseasymm::CreateMaterials(){ // the ratio array is changed to the ratio by weight, so all successive // calls with the same array must specify the number of elements as // positive - AliMixture( 61, "SSD Ceramics$", acer, zcer, denscer, 5, wcer); + AliMixture(61, "SSD Ceramics$", acer, zcer, denscer, 5, wcer); AliMaterial(62, "SSD Kapton$", 12.011, 6., 1.3, 31.27, 999.); // check A and Z AliMaterial(63, "SSD G10FR4$", 17.749, 8.875, 1.8, 21.822, 999.); - AliMaterial(64, "SSD End ladder$", 32.0988, 15.4021, 0.68, 35.3238, 999); - AliMaterial(65, "SSD cone$",63.546, 29., 1.15, 1.265, 999); - //AliMaterial(64, "SSD End ladder$", 32.0988, 15.4021, -0.68, -35.3238, 999); - //AliMaterial(65, "SSD cone$",63.546, 29., -1.15, -1.265, 999); + AliMaterial(64, "SSD End ladder$", 32.0988, 15.4021, 0.68, 35.3238, 999.); + AliMaterial(65, "SSD cone$",63.546, 29., 1.15, 1.265, 999.); + //AliMaterial(64, "SSD End ladder$", 32.0988, 15.4021, -0.68, -35.3238, 999.); + //AliMaterial(65, "SSD cone$",63.546, 29., -1.15, -1.265, 999.); // ** AliMedium(50, "SSD Si$", 50, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003); AliMedium(51, "SSD Si chip$", 51, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003); @@ -924,7 +1086,7 @@ void AliITSvPPRcoarseasymm::CreateMaterials(){ AliMaterial(75, "GEN C$", 12.011, 6., 2.265, 18.8, 999.); // verify density - AliMaterial(76, "GEN Air$", 14.61, 7.3, .001205, 30423., 999); + AliMaterial(76, "GEN Air$", 14.61, 7.3, .001205, 30423., 999.); AliMaterial(77, "GEN Vacuum$", 1e-16, 1e-16, 1e-16, 1e16, 1e16); AliMixture( 78, "GEN POLYETHYL$", apoly, zpoly, .95, -2, wpoly); AliMixture( 79, "GEN SERVICES$", aserv, zserv, 4.68, 4, wserv); @@ -938,7 +1100,8 @@ void AliITSvPPRcoarseasymm::CreateMaterials(){ // AliMaterial(83, "GEN patch pan$", 12.011, 6., 2.265, 18.8, 999.); // check !!! // AliMaterial(84, "GEN serv$", 12.011, 6., 2.265, 18.8, 999.); // check !!! AliMixture(85, "GEN Inox$", asteel, zsteel, 7.88, 4, wsteel); - AliMaterial(86, "GEN Al$", 26.981539, 13., 2.6989, 8.9, 999); + AliMaterial(86, "GEN Al$", 26.981539, 13., 2.6989, 8.9, 999.); + AliMaterial(87,"inox/alum$", 32.1502,15.3383,3.0705,6.9197,999.); // ** AliMedium(75,"GEN C$", 75, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003); AliMedium(76,"GEN Air$", 76, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003); @@ -952,21 +1115,28 @@ void AliITSvPPRcoarseasymm::CreateMaterials(){ // AliMedium(84,"GEN serv$", 84, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003); AliMedium(85,"GEN Inox$", 85, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003); AliMedium(86, "GEN Al$", 86, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003); + AliMedium(87,"inox/alum$", 87, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003); + } //_____________________________________________________________________________ void AliITSvPPRcoarseasymm::Init(){ //////////////////////////////////////////////////////////////////////// // Initialise the ITS after it has been created. //////////////////////////////////////////////////////////////////////// + Int_t i; - // + cout << endl; + for(i=0;i<24;i++) cout << "*";cout << " ITSvPPRcoarseasymm_Init "; + for(i=0;i<25;i++) cout << "*";cout << endl; +// AliITS::Init(); - fMajorVersion = 1; - fMinorVersion = 0; +// + for(i=0;i<72;i++) cout << "*"; + cout << endl; } //_____________________________________________________________________________ -void AliITSvPPRcoarseasymm::DrawModule(){ +void AliITSvPPRcoarseasymm::DrawModule() const { //////////////////////////////////////////////////////////////////////// // Draw a shaded view of the FMD version 6. //////////////////////////////////////////////////////////////////////// @@ -1089,27 +1259,10 @@ void AliITSvPPRcoarseasymm::StepManager(){ hits[5]=momentum[2]; hits[6]=gMC->Edep(); hits[7]=gMC->TrackTime(); -// new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->CurrentTrack(),vol,hits); +// new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->GetMCApp()->GetCurrentTrackNumber(),vol,hits); // // no hits for this coarse asymmetric version. // */ } -/* -//____________________________________________________________________________ -void AliITSvPPRcoarseasymm::Streamer(TBuffer &R__b){ -//////////////////////////////////////////////////////////////////////// -// A dummy Streamer function for this class AliITSvPPRcoarseasymm. By default it -// only streams the AliITS class as it is required. Since this class -// dosen't contain any "real" data to be saved, it doesn't. -//////////////////////////////////////////////////////////////////////// - if (R__b.IsReading()) { - Version_t R__v = R__b.ReadVersion(); if (R__v) { } - AliITS::Streamer(R__b); - } else { - R__b.WriteVersion(AliITSvPPRcoarseasymm::IsA()); - AliITS::Streamer(R__b); - } // end if R__b.IsReading() -} -*/