From cea9b4f73e61785ad7717dd8d732ff8ea00fa17b Mon Sep 17 00:00:00 2001 From: kowal2 Date: Tue, 8 May 2001 16:03:06 +0000 Subject: [PATCH] Geometry update according to the latest technical spec. --- TPC/AliTPCv0.cxx | 65 +++++++++++++++++++++++++----------------------- TPC/AliTPCv1.cxx | 65 +++++++++++++++++++++++++----------------------- TPC/AliTPCv2.cxx | 65 +++++++++++++++++++++++++----------------------- TPC/AliTPCv3.cxx | 65 +++++++++++++++++++++++++----------------------- 4 files changed, 136 insertions(+), 124 deletions(-) diff --git a/TPC/AliTPCv0.cxx b/TPC/AliTPCv0.cxx index 983aa95d515..6908583e5ff 100644 --- a/TPC/AliTPCv0.cxx +++ b/TPC/AliTPCv0.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.25 2001/04/27 15:23:06 kowal2 +Correct materian in the central part of the inner containment vessel + Revision 1.24 2001/04/26 06:15:11 kowal2 Corrected bug in the inner containment vessel (cones) @@ -296,13 +299,13 @@ void AliTPCv0::CreateGeometry() // dm[9]=-247.6; - dm[10]=274.81; + dm[10]=274.8124; dm[11]=278.; // dm[12]=253.6; - dm[13]=274.81; + dm[13]=274.8124; dm[14]=278.; // @@ -323,7 +326,7 @@ void AliTPCv0::CreateGeometry() // Tpc SAndwich 1 - Al - dm[0]=274.81; + dm[0]=274.8124; dm[1]=278.; dm[2]=252.1; @@ -346,8 +349,8 @@ void AliTPCv0::CreateGeometry() // Tpc SAndwich 4 - fiber glass (G10) - dm[0] += 5.e-3; - dm[1] -= 5.e-3; + dm[0] += 3.8e-3; + dm[1] -= 3.8e-3; gMC->Gsvolu("TSA4","TUBE",idtmed[12],dm,3); @@ -397,13 +400,13 @@ void AliTPCv0::CreateGeometry() dm[9]=-250.6; dm[10]=258.; - dm[11]=260.05; + dm[11]=260.0476; // dm[12]=250.6; dm[13]=258.; - dm[14]=260.05; + dm[14]=260.0476; // @@ -424,15 +427,15 @@ void AliTPCv0::CreateGeometry() // Tpc SAndwich 6 - Tedlar dm[0]= 258.; - dm[1]= 260.05; + dm[1]= 260.0476; dm[2]= 252.1; gMC->Gsvolu("TSA6","TUBE",idtmed[9],dm,3); // Tpc SAndwich 7 - fiber glass - dm[0] += 5.e-3; - dm[1] -= 5.e-3; + dm[0] += 3.8e-3; + dm[1] -= 3.8e-3; gMC->Gsvolu("TSA7","TUBE",idtmed[12],dm,3); @@ -529,37 +532,37 @@ void AliTPCv0::CreateGeometry() // dm[9]=-250.6; - dm[10]=77.05; + dm[10]=77.0524; dm[11]=79.2; // dm[12]=-88.; - dm[13]=77.05; + dm[13]=77.0524; dm[14]=79.2; // dm[15]=-88.; - dm[16]=77.09; + dm[16]=77.0924; dm[17]=79.16; // dm[18]=88.; - dm[19]=77.09; + dm[19]=77.0924; dm[20]=79.16; // dm[21]=88.; - dm[22]=77.05; + dm[22]=77.0524; dm[23]=79.2; // dm[24]=250.6; - dm[25]=77.05; + dm[25]=77.0524; dm[26]=79.2; // @@ -580,7 +583,7 @@ void AliTPCv0::CreateGeometry() // Tpc Sandwich 9 -Tedlar - dm[0]=77.09; + dm[0]=77.0924; dm[1]=79.16; dm[2]=88.; @@ -588,8 +591,8 @@ void AliTPCv0::CreateGeometry() // Tpc Sandwich 10 - fiber glass (G10) - dm[0] += 5.e-3; - dm[1] -= 5.e-3; + dm[0] += 3.8e-3; + dm[1] -= 3.8e-3; gMC->Gsvolu("TS10","TUBE",idtmed[12],dm,3); @@ -611,7 +614,7 @@ void AliTPCv0::CreateGeometry() // Tpc Sandwich 12 -Tedlar - dm[0]=77.05; + dm[0]=77.0524; dm[1]=79.2; dm[2]=82.05; @@ -619,8 +622,8 @@ void AliTPCv0::CreateGeometry() // Tpc Sandwich 13 - fiber glass (G10) - dm[0] += 5.e-3; - dm[1] -= 5.e-3; + dm[0] += 3.8e-3; + dm[1] -= 3.8e-3; gMC->Gsvolu("TS13","TUBE",idtmed[12],dm,3); @@ -745,13 +748,13 @@ void AliTPCv0::CreateGeometry() // dm[9]=-69.1; - dm[10]=60.64; + dm[10]=60.6224; dm[11]=61.2; // dm[12]=69.1; - dm[13]=60.64; + dm[13]=60.6224; dm[14]=61.2; // @@ -770,7 +773,7 @@ void AliTPCv0::CreateGeometry() // Tpc Sandwich 15 - Al - dm[0]=60.64; + dm[0]=60.6224; dm[1]=61.2; dm[2]=70.1; @@ -790,17 +793,17 @@ void AliTPCv0::CreateGeometry() gMC->Gsvolu("TS17","TUBE",idtmed[9],dm,3); - // Tpc Sandwich 18 - fiber glass + // Tpc Sandwich 18 - carbon fiber - dm[0] += 5.e-3; - dm[1] -= 5.e-3; + dm[0] += 3.8e-3; + dm[1] -= 3.8e-3; - gMC->Gsvolu("TS18","TUBE",idtmed[12],dm,3); + gMC->Gsvolu("TS18","TUBE",idtmed[15],dm,3); // Tpc Sandwich 19 - Nomex - dm[0] += 0.01; - dm[1] -= 0.01; + dm[0] += 0.02; + dm[1] -= 0.02; gMC->Gsvolu("TS19","TUBE",idtmed[6],dm,3); diff --git a/TPC/AliTPCv1.cxx b/TPC/AliTPCv1.cxx index 0c32db5e426..d7006fb23be 100644 --- a/TPC/AliTPCv1.cxx +++ b/TPC/AliTPCv1.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.28 2001/04/27 15:23:07 kowal2 +Correct materian in the central part of the inner containment vessel + Revision 1.27 2001/04/26 06:15:12 kowal2 Corrected bug in the inner containment vessel (cones) @@ -309,13 +312,13 @@ void AliTPCv1::CreateGeometry() // dm[9]=-247.6; - dm[10]=274.81; + dm[10]=274.8124; dm[11]=278.; // dm[12]=253.6; - dm[13]=274.81; + dm[13]=274.8124; dm[14]=278.; // @@ -336,7 +339,7 @@ void AliTPCv1::CreateGeometry() // Tpc SAndwich 1 - Al - dm[0]=274.81; + dm[0]=274.8124; dm[1]=278.; dm[2]=252.1; @@ -359,8 +362,8 @@ void AliTPCv1::CreateGeometry() // Tpc SAndwich 4 - fiber glass (G10) - dm[0] += 5.e-3; - dm[1] -= 5.e-3; + dm[0] += 3.8e-3; + dm[1] -= 3.8e-3; gMC->Gsvolu("TSA4","TUBE",idtmed[12],dm,3); @@ -410,13 +413,13 @@ void AliTPCv1::CreateGeometry() dm[9]=-250.6; dm[10]=258.; - dm[11]=260.05; + dm[11]=260.0476; // dm[12]=250.6; dm[13]=258.; - dm[14]=260.05; + dm[14]=260.0476; // @@ -437,15 +440,15 @@ void AliTPCv1::CreateGeometry() // Tpc SAndwich 6 - Tedlar dm[0]= 258.; - dm[1]= 260.05; + dm[1]= 260.0476; dm[2]= 252.1; gMC->Gsvolu("TSA6","TUBE",idtmed[9],dm,3); // Tpc SAndwich 7 - fiber glass - dm[0] += 5.e-3; - dm[1] -= 5.e-3; + dm[0] += 3.8e-3; + dm[1] -= 3.8e-3; gMC->Gsvolu("TSA7","TUBE",idtmed[12],dm,3); @@ -542,37 +545,37 @@ void AliTPCv1::CreateGeometry() // dm[9]=-250.6; - dm[10]=77.05; + dm[10]=77.0524; dm[11]=79.2; // dm[12]=-88.; - dm[13]=77.05; + dm[13]=77.0524; dm[14]=79.2; // dm[15]=-88.; - dm[16]=77.09; + dm[16]=77.0924; dm[17]=79.16; // dm[18]=88.; - dm[19]=77.09; + dm[19]=77.0924; dm[20]=79.16; // dm[21]=88.; - dm[22]=77.05; + dm[22]=77.0524; dm[23]=79.2; // dm[24]=250.6; - dm[25]=77.05; + dm[25]=77.0524; dm[26]=79.2; // @@ -593,7 +596,7 @@ void AliTPCv1::CreateGeometry() // Tpc Sandwich 9 -Tedlar - dm[0]=77.09; + dm[0]=77.0924; dm[1]=79.16; dm[2]=88.; @@ -601,8 +604,8 @@ void AliTPCv1::CreateGeometry() // Tpc Sandwich 10 - fiber glass (G10) - dm[0] += 5.e-3; - dm[1] -= 5.e-3; + dm[0] += 3.8e-3; + dm[1] -= 3.8e-3; gMC->Gsvolu("TS10","TUBE",idtmed[12],dm,3); @@ -624,7 +627,7 @@ void AliTPCv1::CreateGeometry() // Tpc Sandwich 12 -Tedlar - dm[0]=77.05; + dm[0]=77.0524; dm[1]=79.2; dm[2]=82.05; @@ -632,8 +635,8 @@ void AliTPCv1::CreateGeometry() // Tpc Sandwich 13 - fiber glass (G10) - dm[0] += 5.e-3; - dm[1] -= 5.e-3; + dm[0] += 3.8e-3; + dm[1] -= 3.8e-3; gMC->Gsvolu("TS13","TUBE",idtmed[12],dm,3); @@ -758,13 +761,13 @@ void AliTPCv1::CreateGeometry() // dm[9]=-69.1; - dm[10]=60.64; + dm[10]=60.6224; dm[11]=61.2; // dm[12]=69.1; - dm[13]=60.64; + dm[13]=60.6224; dm[14]=61.2; // @@ -783,7 +786,7 @@ void AliTPCv1::CreateGeometry() // Tpc Sandwich 15 - Al - dm[0]=60.64; + dm[0]=60.6224; dm[1]=61.2; dm[2]=70.1; @@ -803,17 +806,17 @@ void AliTPCv1::CreateGeometry() gMC->Gsvolu("TS17","TUBE",idtmed[9],dm,3); - // Tpc Sandwich 18 - fiber glass + // Tpc Sandwich 18 - carbon fiber - dm[0] += 5.e-3; - dm[1] -= 5.e-3; + dm[0] += 3.8e-3; + dm[1] -= 3.8e-3; - gMC->Gsvolu("TS18","TUBE",idtmed[12],dm,3); + gMC->Gsvolu("TS18","TUBE",idtmed[15],dm,3); // Tpc Sandwich 19 - Nomex - dm[0] += 0.01; - dm[1] -= 0.01; + dm[0] += 0.02; + dm[1] -= 0.02; gMC->Gsvolu("TS19","TUBE",idtmed[6],dm,3); diff --git a/TPC/AliTPCv2.cxx b/TPC/AliTPCv2.cxx index 3e11f5a8f65..a27f0d86ec6 100644 --- a/TPC/AliTPCv2.cxx +++ b/TPC/AliTPCv2.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.37 2001/04/27 15:23:07 kowal2 +Correct materian in the central part of the inner containment vessel + Revision 1.36 2001/04/26 06:15:12 kowal2 Corrected bug in the inner containment vessel (cones) @@ -372,13 +375,13 @@ void AliTPCv2::CreateGeometry() // dm[9]=-247.6; - dm[10]=274.81; + dm[10]=274.8124; dm[11]=278.; // dm[12]=253.6; - dm[13]=274.81; + dm[13]=274.8124; dm[14]=278.; // @@ -399,7 +402,7 @@ void AliTPCv2::CreateGeometry() // Tpc SAndwich 1 - Al - dm[0]=274.81; + dm[0]=274.8124; dm[1]=278.; dm[2]=252.1; @@ -422,8 +425,8 @@ void AliTPCv2::CreateGeometry() // Tpc SAndwich 4 - fiber glass (G10) - dm[0] += 5.e-3; - dm[1] -= 5.e-3; + dm[0] += 3.8e-3; + dm[1] -= 3.8e-3; gMC->Gsvolu("TSA4","TUBE",idtmed[12],dm,3); @@ -473,13 +476,13 @@ void AliTPCv2::CreateGeometry() dm[9]=-250.6; dm[10]=258.; - dm[11]=260.05; + dm[11]=260.0476; // dm[12]=250.6; dm[13]=258.; - dm[14]=260.05; + dm[14]=260.0476; // @@ -500,15 +503,15 @@ void AliTPCv2::CreateGeometry() // Tpc SAndwich 6 - Tedlar dm[0]= 258.; - dm[1]= 260.05; + dm[1]= 260.0476; dm[2]= 252.1; gMC->Gsvolu("TSA6","TUBE",idtmed[9],dm,3); // Tpc SAndwich 7 - fiber glass - dm[0] += 5.e-3; - dm[1] -= 5.e-3; + dm[0] += 3.8e-3; + dm[1] -= 3.8e-3; gMC->Gsvolu("TSA7","TUBE",idtmed[12],dm,3); @@ -605,37 +608,37 @@ void AliTPCv2::CreateGeometry() // dm[9]=-250.6; - dm[10]=77.05; + dm[10]=77.0524; dm[11]=79.2; // dm[12]=-88.; - dm[13]=77.05; + dm[13]=77.0524; dm[14]=79.2; // dm[15]=-88.; - dm[16]=77.09; + dm[16]=77.0924; dm[17]=79.16; // dm[18]=88.; - dm[19]=77.09; + dm[19]=77.0924; dm[20]=79.16; // dm[21]=88.; - dm[22]=77.05; + dm[22]=77.0524; dm[23]=79.2; // dm[24]=250.6; - dm[25]=77.05; + dm[25]=77.0524; dm[26]=79.2; // @@ -656,7 +659,7 @@ void AliTPCv2::CreateGeometry() // Tpc Sandwich 9 -Tedlar - dm[0]=77.09; + dm[0]=77.0924; dm[1]=79.16; dm[2]=88.; @@ -664,8 +667,8 @@ void AliTPCv2::CreateGeometry() // Tpc Sandwich 10 - fiber glass (G10) - dm[0] += 5.e-3; - dm[1] -= 5.e-3; + dm[0] += 3.8e-3; + dm[1] -= 3.8e-3; gMC->Gsvolu("TS10","TUBE",idtmed[12],dm,3); @@ -687,7 +690,7 @@ void AliTPCv2::CreateGeometry() // Tpc Sandwich 12 -Tedlar - dm[0]=77.05; + dm[0]=77.0524; dm[1]=79.2; dm[2]=82.05; @@ -695,8 +698,8 @@ void AliTPCv2::CreateGeometry() // Tpc Sandwich 13 - fiber glass (G10) - dm[0] += 5.e-3; - dm[1] -= 5.e-3; + dm[0] += 3.8e-3; + dm[1] -= 3.8e-3; gMC->Gsvolu("TS13","TUBE",idtmed[12],dm,3); @@ -821,13 +824,13 @@ void AliTPCv2::CreateGeometry() // dm[9]=-69.1; - dm[10]=60.64; + dm[10]=60.6224; dm[11]=61.2; // dm[12]=69.1; - dm[13]=60.64; + dm[13]=60.6224; dm[14]=61.2; // @@ -846,7 +849,7 @@ void AliTPCv2::CreateGeometry() // Tpc Sandwich 15 - Al - dm[0]=60.64; + dm[0]=60.6224; dm[1]=61.2; dm[2]=70.1; @@ -866,17 +869,17 @@ void AliTPCv2::CreateGeometry() gMC->Gsvolu("TS17","TUBE",idtmed[9],dm,3); - // Tpc Sandwich 18 - fiber glass + // Tpc Sandwich 18 - carbon fiber - dm[0] += 5.e-3; - dm[1] -= 5.e-3; + dm[0] += 3.8e-3; + dm[1] -= 3.8e-3; - gMC->Gsvolu("TS18","TUBE",idtmed[12],dm,3); + gMC->Gsvolu("TS18","TUBE",idtmed[15],dm,3); // Tpc Sandwich 19 - Nomex - dm[0] += 0.01; - dm[1] -= 0.01; + dm[0] += 0.02; + dm[1] -= 0.02; gMC->Gsvolu("TS19","TUBE",idtmed[6],dm,3); diff --git a/TPC/AliTPCv3.cxx b/TPC/AliTPCv3.cxx index b661fa18d2f..4b2d46a2870 100644 --- a/TPC/AliTPCv3.cxx +++ b/TPC/AliTPCv3.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.26 2001/04/27 15:23:07 kowal2 +Correct materian in the central part of the inner containment vessel + Revision 1.25 2001/04/26 06:15:12 kowal2 Corrected bug in the inner containment vessel (cones) @@ -314,13 +317,13 @@ void AliTPCv3::CreateGeometry() // dm[9]=-247.6; - dm[10]=274.81; + dm[10]=274.8124; dm[11]=278.; // dm[12]=253.6; - dm[13]=274.81; + dm[13]=274.8124; dm[14]=278.; // @@ -341,7 +344,7 @@ void AliTPCv3::CreateGeometry() // Tpc SAndwich 1 - Al - dm[0]=274.81; + dm[0]=274.8124; dm[1]=278.; dm[2]=252.1; @@ -364,8 +367,8 @@ void AliTPCv3::CreateGeometry() // Tpc SAndwich 4 - fiber glass (G10) - dm[0] += 5.e-3; - dm[1] -= 5.e-3; + dm[0] += 3.8e-3; + dm[1] -= 3.8e-3; gMC->Gsvolu("TSA4","TUBE",idtmed[12],dm,3); @@ -415,13 +418,13 @@ void AliTPCv3::CreateGeometry() dm[9]=-250.6; dm[10]=258.; - dm[11]=260.05; + dm[11]=260.0476; // dm[12]=250.6; dm[13]=258.; - dm[14]=260.05; + dm[14]=260.0476; // @@ -442,15 +445,15 @@ void AliTPCv3::CreateGeometry() // Tpc SAndwich 6 - Tedlar dm[0]= 258.; - dm[1]= 260.05; + dm[1]= 260.0476; dm[2]= 252.1; gMC->Gsvolu("TSA6","TUBE",idtmed[9],dm,3); // Tpc SAndwich 7 - fiber glass - dm[0] += 5.e-3; - dm[1] -= 5.e-3; + dm[0] += 3.8e-3; + dm[1] -= 3.8e-3; gMC->Gsvolu("TSA7","TUBE",idtmed[12],dm,3); @@ -547,37 +550,37 @@ void AliTPCv3::CreateGeometry() // dm[9]=-250.6; - dm[10]=77.05; + dm[10]=77.0524; dm[11]=79.2; // dm[12]=-88.; - dm[13]=77.05; + dm[13]=77.0524; dm[14]=79.2; // dm[15]=-88.; - dm[16]=77.09; + dm[16]=77.0924; dm[17]=79.16; // dm[18]=88.; - dm[19]=77.09; + dm[19]=77.0924; dm[20]=79.16; // dm[21]=88.; - dm[22]=77.05; + dm[22]=77.0524; dm[23]=79.2; // dm[24]=250.6; - dm[25]=77.05; + dm[25]=77.0524; dm[26]=79.2; // @@ -598,7 +601,7 @@ void AliTPCv3::CreateGeometry() // Tpc Sandwich 9 -Tedlar - dm[0]=77.09; + dm[0]=77.0924; dm[1]=79.16; dm[2]=88.; @@ -606,8 +609,8 @@ void AliTPCv3::CreateGeometry() // Tpc Sandwich 10 - fiber glass (G10) - dm[0] += 5.e-3; - dm[1] -= 5.e-3; + dm[0] += 3.8e-3; + dm[1] -= 3.8e-3; gMC->Gsvolu("TS10","TUBE",idtmed[12],dm,3); @@ -629,7 +632,7 @@ void AliTPCv3::CreateGeometry() // Tpc Sandwich 12 -Tedlar - dm[0]=77.05; + dm[0]=77.0524; dm[1]=79.2; dm[2]=82.05; @@ -637,8 +640,8 @@ void AliTPCv3::CreateGeometry() // Tpc Sandwich 13 - fiber glass (G10) - dm[0] += 5.e-3; - dm[1] -= 5.e-3; + dm[0] += 3.8e-3; + dm[1] -= 3.8e-3; gMC->Gsvolu("TS13","TUBE",idtmed[12],dm,3); @@ -763,13 +766,13 @@ void AliTPCv3::CreateGeometry() // dm[9]=-69.1; - dm[10]=60.64; + dm[10]=60.6224; dm[11]=61.2; // dm[12]=69.1; - dm[13]=60.64; + dm[13]=60.6224; dm[14]=61.2; // @@ -788,7 +791,7 @@ void AliTPCv3::CreateGeometry() // Tpc Sandwich 15 - Al - dm[0]=60.64; + dm[0]=60.6224; dm[1]=61.2; dm[2]=70.1; @@ -808,17 +811,17 @@ void AliTPCv3::CreateGeometry() gMC->Gsvolu("TS17","TUBE",idtmed[9],dm,3); - // Tpc Sandwich 18 - fiber glass + // Tpc Sandwich 18 - carbon fiber - dm[0] += 5.e-3; - dm[1] -= 5.e-3; + dm[0] += 3.8e-3; + dm[1] -= 3.8e-3; - gMC->Gsvolu("TS18","TUBE",idtmed[12],dm,3); + gMC->Gsvolu("TS18","TUBE",idtmed[15],dm,3); // Tpc Sandwich 19 - Nomex - dm[0] += 0.01; - dm[1] -= 0.01; + dm[0] += 0.02; + dm[1] -= 0.02; gMC->Gsvolu("TS19","TUBE",idtmed[6],dm,3); -- 2.43.0