diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_SkiAux.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_SkiAux.h index 3985d43a1e1471c139e9e4030adcdcab8f42958f..d01b0935332e7c87a8fc918a491db807ba77c4ae 100644 --- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_SkiAux.h +++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_SkiAux.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */ #ifndef SCT_GEOMODEL_SCT_SKIAUX_H @@ -10,7 +10,6 @@ #include <string> class SCT_Ski; -// 14th Aug 2005 S.Mima modified. class SCT_Bracket; class SCT_Harness; class SCT_SkiPowerTape; @@ -50,8 +49,6 @@ public: // Retrieve child elements const SCT_Ski * ski() const {return m_ski;} - // 14th Aug 2005 S.Mima modified. - // const SCT_Bracket * bracket() const {return m_bracket;} const SCT_Bracket * bracket() const {return m_bracket;} const SCT_Harness * harness() const {return m_harness;} const SCT_SkiPowerTape* skiPowerTape() const {return m_skiPowerTape;} diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_InnerSide.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_InnerSide.cxx index 7dcfc93d6b8634a7b8a62d1cc2d871a25be0595d..2d7d03a7269b8dbbe4a1800476a3095613ad09f2 100644 --- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_InnerSide.cxx +++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_InnerSide.cxx @@ -103,8 +103,6 @@ SCT_InnerSide::preBuild() // ise : InnerSideEnvelope // Reference: sct_module_geometry.ps // - // 28th Mar S.Mima modified - // Wed 15th Jun 2005 D.Naito modified. const double w_ise1 = w_sensor + m_safety; const double t_ise1 = t_sensor + m_safety; const double l_ise1 = l_sensor + m_safety; @@ -154,12 +152,7 @@ SCT_InnerSide::preBuild() const GeoLogVol * InnerSideEnvelopeLog = new GeoLogVol("InnerSideEnvelope", &InnerSideEnvelopeShape, m_materials->gasMaterial()); - // 28th Mar S.Mima modified - // *** 16:30 Wed 15th Jun 2005 D.Naito modified. (00)********************************* - //m_thickness = 0.5*t_sensor + hybridPosX + 0.5*t_ise2; - // *** -->> (00)********************************* m_thickness = 0.5*t_ise1 + hybridPosX + 0.5*t_ise2; - // *** End of modified lines. ------------------ (00)********************************* m_width = w_ise1; m_length = l_ise1; diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Module.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Module.cxx index d192435a5bbd18e54d231dc20043ba521dc811d4..88f6a81e53f497c891065cdcff809b633f1923f2 100644 --- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Module.cxx +++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Module.cxx @@ -34,7 +34,6 @@ #include "GeoModelKernel/GeoAlignableTransform.h" #include "GeoModelKernel/GeoDefinitions.h" #include "GaudiKernel/SystemOfUnits.h" -// 8th Aug 2005 S.Mima modified. #include "GeoModelKernel/GeoShapeSubtraction.h" #include <cmath> @@ -231,7 +230,6 @@ SCT_Module::preBuild() m_env2RefPointVector = std::make_unique<GeoTrf::Vector3D>(-xCenterEnv2, -yCenterEnv2, -zCenterEnv2); - // 8th Aug 2005 S.Mima modified. // Calculate dimension of subbox const double xmaxSubBox = - 0.5*m_baseBoard->thickness() - m_safety; const double xminSubBox = - 0.5*thicknessEnv2 - 2.0*m_safety; @@ -274,11 +272,9 @@ SCT_Module::preBuild() // // Make an envelope for the whole module. // - // 6th Feb 2005 D.Naito modified. const GeoBox * envelope1 = new GeoBox(0.5*m_env1Thickness, 0.5*m_env1Width, 0.5*m_env1Length); const GeoBox * envelope2 = new GeoBox(0.5*m_env2Thickness, 0.5*m_env2Width, 0.5*m_env2Length); - // 8th Aug 2005 S.Mima modified. const GeoBox * subBox = new GeoBox(0.5*thicknessSubBox, 0.5*widthSubBox, 0.6*lengthSubBox); // In the following, envelope1 and envelope2 are added and SUBBOX is pulled. @@ -302,7 +298,6 @@ SCT_Module::preBuild() // // base board - // 6th Apr 2005 S.Mima modified. // const double baseBoardPosY = m_baseBoardOffsetY; const double baseBoardPosZ = m_baseBoardOffsetZ; diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Ski.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Ski.cxx index 3172db64fc682b50f06d3da9f6ee90ec87b2dc0a..aba3868c304d6ef9e141a1e41af68046ae960613 100644 --- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Ski.cxx +++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Ski.cxx @@ -86,13 +86,12 @@ SCT_Ski::getParameters() m_coolingPipeRadialOffset = 0; m_coolingPipePhiOffset = 0; - // 10th Aug 2005 S.Mima modified. m_coolingBlockOffsetX = parameters->coolingBlockOffsetX(); m_coolingBlockOffsetY = parameters->coolingBlockOffsetY(); m_coolingBlockOffsetZ = parameters->coolingBlockOffsetZ(); m_coolingPipeOffsetX = parameters->coolingPipeOffsetX(); m_coolingPipeOffsetY = parameters->coolingPipeOffsetY(); - // 15th Aug 2005 S.Mima modified. + m_doglegOffsetX = parameters->doglegOffsetX(); m_doglegOffsetY = parameters->doglegOffsetY(); } @@ -121,62 +120,7 @@ SCT_Ski::preBuild() double xModuleOffset = 0.5 * m_radialSep; - // *** 10:00 Mon 30th May 2005 D.Naito modified. (12)********************************* - // I get what "yModuleOffset" has role. "yModuleOffset" must be zero. - // I move the calculations of corners to lower area in this code(L336 ~ L367). - // "yModuleOffset = -0.5*(moduleYMax + moduleYMin)" is wrong. - - // *** 18:00 Fri 27th May 2005 D.Naito added. (09)********************************* - - // *** 18:00 Fri 27th May 2005 D.Naito put some comments. - // I need to calculate moduleYMax and moduleYMin for yModuleOffset, - // because the modules is asyGaudi::Units::mmetry in y direction. - - // - // These are coordinates of corners of module's envelopes. - // - - //GeoTrf::Vector3D c0(0.0, 0.5*(m_module->env1Width()), 0.5*(m_module->env1Length())); - //GeoTrf::Vector3D c1(0.0, -0.5*(m_module->env1Width()), 0.5*(m_module->env1Length())); - //GeoTrf::Vector3D c2(0.0, -0.5*(m_module->env1Width()), -0.5*(m_module->env1Length())); - //GeoTrf::Vector3D c3(0.0, 0.5*(m_module->env1Width()), -0.5*(m_module->env1Length())); - //GeoTrf::Vector3D c4(0.0, - // -(m_module->env2RefPointVector()->y()) + 0.5*(m_module->env2Width()), - // -(m_module->env2RefPointVector()->z()) + 0.5*(m_module->env2Length())); - //GeoTrf::Vector3D c5(0.0, - // -(m_module->env2RefPointVector()->y()) - 0.5*(m_module->env2Width()), - // -(m_module->env2RefPointVector()->z()) + 0.5*(m_module->env2Length())); - //GeoTrf::Vector3D c6(0.0, - // -(m_module->env2RefPointVector()->y()) - 0.5*(m_module->env2Width()), - // -(m_module->env2RefPointVector()->z()) - 0.5*(m_module->env2Length())); - //GeoTrf::Vector3D c7(0.0, - // -(m_module->env2RefPointVector()->y()) + 0.5*(m_module->env2Width()), - // -(m_module->env2RefPointVector()->z()) - 0.5*(m_module->env2Length())); - - //double moduleYMax = c4.y(); - //double moduleYMin = c5.y(); - // c0.rotateX(0.5 * m_stereoSign * m_module->stereoAngle()); - // c1.rotateX(0.5 * m_stereoSign * m_module->stereoAngle()); - // c2.rotateX(0.5 * m_stereoSign * m_module->stereoAngle()); - // c3.rotateX(0.5 * m_stereoSign * m_module->stereoAngle()); - // c4.rotateX(0.5 * m_stereoSign * m_module->stereoAngle()); - // c5.rotateX(0.5 * m_stereoSign * m_module->stereoAngle()); - // c6.rotateX(0.5 * m_stereoSign * m_module->stereoAngle()); - // c7.rotateX(0.5 * m_stereoSign * m_module->stereoAngle()); - - // moduleYMax = std::max(std::max(c0.y(), c4.y()), std::max(c7.y(), c3.y())); - // moduleYMin = std::min(std::min(c1.y(), c5.y()), std::min(c6.y(), c2.y())); - // *** End of added lines. --------------------- (09)********************************* - - - // *** 18:00 Fri 27th May 2005 D.Naito modified. (10)********************************* - //double yModuleOffset = 0; - // *** -->> (10)********************************* - //double yModuleOffset = -0.5*(moduleYMax + moduleYMin); - // *** End of modified lines. ------------------ (10)********************************* - // *** -->> (12)********************************* double yModuleOffset = 0.0; - // *** End of modified lines. ------------------ (12)********************************* // @@ -184,65 +128,26 @@ SCT_Ski::preBuild() // // Position the cooling block m_coolingBlockPhiOffset from the lower egde // of the module and m_coolingBlockRadialOffset from surface of the module. - // double xCoolingBlockOffset = -(m_coolingBlockRadialOffset + - // 0.5 * m_module->thickness() + - // 0.5 * m_coolingBlock->thickness()) + epsilon(); - // 10th Aug 2005 S.Mima modified. + double xCoolingBlockOffset = - m_coolingBlockRadialOffset + coolingBlockOffsetX(); - // Works for both tilts. - // *** 18:00 Wed 15th Jun 2005 D.Naito modified. (00)********************************* - // *** 14:00 Fri 27th May 2005 D.Naito modified. (03)********************************* - //double yCoolingBlockOffset = -tiltSign *(0.5 * m_module->baseBoard()->width() - // - 0.5 * m_coolingBlock->width() - // - m_coolingBlockPhiOffset ); - //double zCoolingBlockOffset = m_module->baseBoardCenter(); - // *** -->> (03)********************************* - //double yCoolingBlockOffset = tiltSign *(m_module->baseBoard()->bb1OffsetY() - 0.5*(m_module->baseBoard()->bb1()->width()) - // + 0.5*m_coolingBlock->width() - m_coolingBlockPhiOffset); - //double zCoolingBlockOffset = m_module->baseBoard()->bb1OffsetZ() - 0.5*(m_module->baseBoard()->bb3()->length()); - // *** End of modified lines. ------------------ (03)********************************* - // *** -->> (00)********************************* - //double yCoolingBlockOffset = tiltSign *(m_module->baseBoardOffsetY() - 0.5*(m_module->baseBoard()->width()) - // + 0.5*m_coolingBlock->width() - m_coolingBlockPhiOffset); - // 10th Aug 2005 S.Mima modified. double yCoolingBlockOffset = tiltSign *(coolingBlockOffsetY() - m_coolingBlockPhiOffset); - // double zCoolingBlockOffset = m_module->baseBoardOffsetZ(); - // 10th Aug 2005 S.Mima modified. double zCoolingBlockOffset = coolingBlockOffsetZ(); - // *** End of modified lines. ------------------ (03)********************************* // // Calculate position of dogleg // - // *** 17:00 Fri 27th May 2005 D.Naito modified. (06)********************************* - //double xDoglegOffset = - (m_doglegRadialOffset + 0.5 *m_dogleg->thickness() - // + 0.5 * m_module->thickness()) - // *** -->> (06)********************************* - // 15th Aug 2005 S.Mima modified. - // double xDoglegOffset = - (m_doglegRadialOffset + 0.5 *m_dogleg->thickness() - // + 0.5 * m_module->env2Thickness() + epsilon()); + double xDoglegOffset = doglegOffsetX() - m_doglegRadialOffset; - // *** End of modified lines. ------------------ (06)********************************* // NB length of dogleg runs in phi direction. double yDoglegOffset = tiltSign * (doglegOffsetY() + m_doglegPhiOffset); - // 15th Aug 2005 S.Mima modified. - // double zDoglegOffset = m_module->baseBoardCenter(); double zDoglegOffset = coolingBlockOffsetZ(); // // Calculate position of cooling pipe. // - // First calculate minimum block position. - //double xCoolingBlockPosMin = -xModuleOffset + xCoolingBlockOffset; - //double yCoolingBlockPosMin = -yModuleOffset + yCoolingBlockOffset; - //double yCoolingBlockPosMin = yCoolingBlockOffset; - // 10th Aug 2005 S.Mima modified. - // double xCoolingPipePos = xCoolingBlockPosMin - (m_coolingPipeRadialOffset + - // 0.5 * m_coolingBlock->thickness() + m_coolingPipe->pipeRadius()); double xCoolingPipePos = coolingPipeOffsetX() - m_coolingPipeRadialOffset; - //double yCoolingPipePos = yCoolingBlockPosMin + m_coolingPipePhiOffset; double yCoolingPipePos = coolingPipeOffsetY() + m_coolingPipePhiOffset; m_coolingPipePos = new GeoTransform(GeoTrf::Translate3D(xCoolingPipePos, yCoolingPipePos, 0)); m_coolingPipePos->ref(); @@ -259,11 +164,7 @@ SCT_Ski::preBuild() // Not sure if this needs to be alignable double xModulePos = stagger_sign * xModuleOffset; - // *** 20:00 Fri 27th May 2005 D.Naito modified. (11)********************************* - //double yModulePos = stagger_sign * yModuleOffset; - // *** -->> (11)********************************* double yModulePos = yModuleOffset; - // *** End of modified lines. ------------------ (04)********************************* double zModulePos = m_zPos[iModule]; // There is only one type of module and this is rotated one way or the other @@ -343,13 +244,9 @@ SCT_Ski::preBuild() double skiWidth = moduleYMax - moduleYMin + 2*rphiClearance; // - // 17:00 Fri 27th May 2005 D.Naito put some comments. - // m_module->thickness() corresponds to the thickness of envelope2 of SCT_Module. // NB. The envelope is centered on x. // double skiThickness = m_module->thickness() + 2 * std::abs(xModuleOffset) + radialClearance; - //double skiLength = 2.0 * std::max(std::abs(m_zPos[0]), std::abs(m_zPos[m_modulesPerSki - 1])) - // + m_module->length(); // Due to the cooling block and dogleg being next to the module and // as the modules are staggered it is no longer possible to have a @@ -366,16 +263,8 @@ SCT_Ski::preBuild() // Take into account possiblity that the dogleg extends past the module. - // *** 17:00 Fri 27th May 2005 D.Naito modified. (07)********************************* - //double maxWidth = std::max(std::max(std::abs(-yModuleOffset + yDoglegOffset) + 0.5*m_dogleg->length(), - // std::abs(+yModuleOffset + yDoglegOffset) + 0.5*m_dogleg->length()), - // 0.5*skiWidth); - //double ymax1 = maxWidth; - //double ymin1 = -maxWidth; - // *** -->> (07)********************************* double ymax1 = moduleYMax + rphiClearance; double ymin1 = moduleYMin - rphiClearance; - // *** End of modified lines. ------------------ (07)********************************* double ymin2,ymax2; if (tiltSign > 0) { ymax2 = std::max(-yModuleOffset + yCoolingBlockOffset + 0.5*m_coolingBlock->width(), @@ -403,21 +292,16 @@ SCT_Ski::preBuild() double yCenter = 0.5*(ymin1+ymax1); double xShift2 = 0.5*(xmin2+xmax2) - xCenter; double yShift2 = 0.5*(ymin2+ymax2) - yCenter; - //double xCoolingPipeShift = xCoolingPipePos - xCenter; - //double yCoolingPipeShift = yCoolingPipePos - yCenter; m_refPointTransform = new GeoTransform(GeoTrf::Translate3D(-xCenter, -yCenter, 0)); m_refPointTransform->ref(); - // *** 10:00 Tue 31st May 2005 D.Naito modified. (14)********************************* - // *** -->> (14)********************************* m_env1RefPointVector = std::make_unique<GeoTrf::Vector3D>(-xCenter, -yCenter, 0.0); m_env2RefPointVector = std::make_unique<GeoTrf::Vector3D>(-xShift2, -yShift2, 0.0); m_env1Thickness = xmax1-xmin1; m_env1Width = ymax1-ymin1; m_env2Thickness = xmax2-xmin2; m_env2Width = ymax2-ymin2; - // *** End of modified lines. ------------------ (14)********************************* GeoBox * envelope1 = new GeoBox(0.5 * (xmax1-xmin1), 0.5 * (ymax1-ymin1), 0.5 * m_length); GeoBox * envelope2 = new GeoBox(0.5 * (xmax2-xmin2), 0.5 * (ymax2-ymin2), 0.5 * m_length); @@ -430,8 +314,6 @@ SCT_Ski::preBuild() GeoLogVol * skiLog = new GeoLogVol(getName(), skiEnvelopeShape, m_materials->gasMaterial()); - //GeoPhysVol * ski = new GeoPhysVol(skiLog); - // Make names once only so we don't recreate them again again. for (int iModule = 0; iModule < m_modulesPerSki; iModule++) { // Add identifier to name. @@ -444,12 +326,7 @@ SCT_Ski::preBuild() // Define thickness, width, and length. This is chosen as bounding box centered on the ski rotation axis // which contains the modules and dogleg (ie cooling blocks and cooling pipe is ignored.) m_thickness = 2 * std::abs(xmin1); - // *** 17:00 Fri 27th May 2005 D.Naito modified. (08)********************************* - //m_width = 2 * maxWidth; - // *** -->> (08)********************************* m_width = skiWidth; - // *** End of modified lines. ------------------ (08)********************************* - // m_length defined in constructor. // Calculate the clearances. Module envelope1 is the thickness up to the sensors. This is used for the module to diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_SkiAux.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_SkiAux.cxx index 1c3d5213f88c5dc4a867ec30ad6e0965fc32458e..d95255ec71d607649a7aa5e8ef372ca6cad7c5d5 100644 --- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_SkiAux.cxx +++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_SkiAux.cxx @@ -13,7 +13,6 @@ #include "SCT_GeoModel/SCT_Ski.h" #include "SCT_GeoModel/SCT_Module.h" -// 14th Aug 2005 S.Mima modified. #include "SCT_GeoModel/SCT_Bracket.h" #include "SCT_GeoModel/SCT_Harness.h" #include "SCT_GeoModel/SCT_SkiPowerTape.h" @@ -81,17 +80,11 @@ SCT_SkiAux::build() // such that the lower edge of the bracket is lined up with the upper // edge of the next module below it. - // std::cout << "m_bracketPhiOffset = " << m_bracketPhiOffset << std::endl; - // std::cout << "m_powerTapePhiOffset = " << m_powerTapePhiOffset << std::endl; - // std::cout << "m_sectorAngle = " << m_sectorAngle << std::endl; - // Define small distance for avoiding overlaps. double radiusBracket = m_innerRadius + 0.5*m_bracket->thickness() + epsilon(); double xBracketPos = radiusBracket * cos(m_bracketPhiOffset); double yBracketPos = radiusBracket * sin(m_bracketPhiOffset); - // std::cout << "Bracket x,y = " << xBracketPos << " " << yBracketPos << std::endl; - // Calculate position of harness, if present. Phi offset is // same as power tapes, and we leave a gap equal to one tape // width @@ -104,7 +97,6 @@ SCT_SkiAux::build() xHarnessPos = radiusHarness * cos(m_powerTapePhiOffset); yHarnessPos = radiusHarness * sin(m_powerTapePhiOffset); } - // std::cout << "Harness x,y = " << xHarnessPos << " " << yHarnessPos << std::endl; // // Calculate Position of PowerTapes @@ -122,8 +114,6 @@ SCT_SkiAux::build() double xTapePos = radiusTape * cos(m_powerTapePhiOffset); double yTapePos = radiusTape * sin(m_powerTapePhiOffset); - // std::cout << "Tape x,y = " << xTapePos << " " << yTapePos << std::endl; - // // Calculate envelope. // @@ -175,14 +165,6 @@ SCT_SkiAux::build() const GeoLogVol *skiAuxLog = new GeoLogVol(getName(), skiAuxShape, m_materials->gasMaterial()); GeoPhysVol * skiAux = new GeoPhysVol(skiAuxLog); - // std::cout << "SCT_SkiAux: m_sectorStartAngle = " << m_sectorStartAngle - // << ", m_sectorAngle = " << m_sectorAngle << std::endl; - // - // std::cout << "minangle, maxangle, m_sectorStartAngle, m_sectorAngle = " - // << std::endl; - // std::cout << minAngle << "," << maxAngle << ", " - // << m_sectorStartAngle << "," - // << m_sectorAngle << std::endl; // // Position brackets @@ -192,8 +174,6 @@ SCT_SkiAux::build() for (int iModule = 0; iModule < m_ski->modulesPerSki(); iModule++) { // Z Position is position of the center of the baseBoard: - // 15th Aug 2005 S.Mima modified. - // double baseBoardPosZ = m_ski->zPos(iModule) + m_ski->module()->baseBoardCenter(); double coolingCenterPosZ = m_ski->zPos(iModule) + m_ski->coolingBlockOffsetZ(); GeoTrf::Translation3D posBracket(xBracketPos, yBracketPos, coolingCenterPosZ); GeoTrf::RotateZ3D rotBracket(m_bracketPhiOffset); @@ -242,12 +222,6 @@ calcMinMaxRatioS(double xCenter, double yCenter, r10 = (yCenter + y) / (xCenter - x); r01 = (yCenter - y) / (xCenter + x); - //std::cout << "r11,r00,r10,r02: " - // << r11 << " " - // << r00 << " " - // << r10 << " " - // << r01 << " " << std::endl; - minRatio = std::min(r11 , std::min(r00, std::min(r10, r01))); maxRatio = std::max(r11 , std::max(r00, std::max(r10, r01))); diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_SkiPowerTape.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_SkiPowerTape.cxx index a80601666bf24b1a988666369c6b332e49f52b01..9d1f747a2eba56be3439f020c547b0aea51a36e6 100644 --- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_SkiPowerTape.cxx +++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_SkiPowerTape.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */ // @@ -15,7 +15,7 @@ #include "SCT_GeoModel/SCT_Ski.h" #include "SCT_GeoModel/SCT_PowerTape.h" -#include "SCT_GeoModel/SCT_Module.h" // 28th Mar 2005 S.Mima modified. +#include "SCT_GeoModel/SCT_Module.h" #include "GeoModelKernel/GeoBox.h" #include "GeoModelKernel/GeoLogVol.h" @@ -84,11 +84,6 @@ SCT_SkiPowerTape::build() double ltot = 0.; for (int iModule = 0; iModule < m_ski->modulesPerSki(); iModule++) { - // Position of center of hybrid: - // 15th Aug 2005 S.Mima modified. - // double baseBoardPos = m_ski->zPos(iModule) + m_ski->module()->baseBoardCenter(); - - // Position PowerTapes // These run from the nearest interlink to the edge of the dogleg double tapeLength, tapeMid, tapeStart, tapeEnd; @@ -104,9 +99,6 @@ SCT_SkiPowerTape::build() if (m_ski->zPos(iModule) > 0) { // Tape runs from high z end to edge of dogleg. NB width of dogleg is in z-direction - // 15th Aug 2005 S.Mima modified. - // tapeStart = baseBoardPos + 0.5 * m_ski->dogleg()->width(); - // tapeEnd = 0.5 * m_length; tapeStart = m_ski->zPos(iModule) + m_ski->coolingBlockOffsetZ() + m_powerTapeStartPointOffset; tapeEnd = 0.5 * m_length; @@ -116,9 +108,6 @@ SCT_SkiPowerTape::build() } else { // Tape runs from low z end to edge of dogleg. NB width of dogleg is in z-direction - // 15th Aug 2005 S.Mima modified. - // tapeStart = baseBoardPos - 0.5 * m_ski->dogleg()->width(); - // tapeEnd = -0.5 * m_length; tapeStart = m_ski->zPos(iModule) + m_ski->coolingBlockOffsetZ() - m_powerTapeStartPointOffset; tapeEnd = -0.5 * m_length; @@ -129,7 +118,6 @@ SCT_SkiPowerTape::build() tapeLength = std::abs(tapeEnd - tapeStart); tapeMid = 0.5 * (tapeEnd + tapeStart); - // std::cout << "Tape length = " << tapeLength << std::endl; // Make sure that first half are negative and secand half are positive. @@ -143,7 +131,6 @@ SCT_SkiPowerTape::build() // Create the tape // Label tape with M# at end of string - //std::ostringstream label; label << "PowerTapeM" << iModule + 1; SCT_PowerTape powerTape(getName()+"PowerTapeM"+intToString(iModule + 1), tapeLength, m_detectorManager, m_geometryManager, m_materials);