Created metal stack + chenged rotation of the two chip columns in module

Author: scannito

Detectors/Upgrades/ALICE3/TRK/base/include/TRKBase/GeometryTGeo.h

@@ -53,6 +53,7 @@ class GeometryTGeo : public o2::detectors::DetMatrixCache
   static const char* getTRKChipPattern() { return sChipName.c_str(); }
   static const char* getTRKSensorPattern() { return sSensorName.c_str(); }
   static const char* getTRKDeadzonePattern() { return sDeadzoneName.c_str(); }
+  static const char* getTRKMetalStackPattern() { return sMetalStackName.c_str(); }
 
   static const char* getTRKWrapVolPattern() { return sWrapperVolumeName.c_str(); }
 
@@ -171,6 +172,7 @@ class GeometryTGeo : public o2::detectors::DetMatrixCache
   static std::string sChipName;
   static std::string sSensorName;
   static std::string sDeadzoneName;
+  static std::string sMetalStackName;
 
   static std::string sWrapperVolumeName; ///< Wrapper volume name, not implemented at the moment
 

Detectors/Upgrades/ALICE3/TRK/base/src/GeometryTGeo.cxx

@@ -36,6 +36,7 @@ std::string GeometryTGeo::sModuleName = "TRKModule";
 std::string GeometryTGeo::sChipName = "TRKChip";
 std::string GeometryTGeo::sSensorName = "TRKSensor";
 std::string GeometryTGeo::sDeadzoneName = "TRKDeadzone";
+std::string GeometryTGeo::sMetalStackName = "TRKMetalStack";
 
 std::string GeometryTGeo::sWrapperVolumeName = "TRKUWrapVol"; ///< Wrapper volume name, not implemented at the moment
 

Detectors/Upgrades/ALICE3/TRK/simulation/include/TRKSimulation/TRKLayer.h

@@ -42,6 +42,7 @@ class TRKLayer
 
   TGeoVolume* createSensor(std::string type);
   TGeoVolume* createDeadzone(std::string type);
+  TGeoVolume* createMetalStack(std::string type);
   TGeoVolume* createChip(std::string type);
   TGeoVolume* createModule(std::string type);
   TGeoVolume* createStave(std::string type);
@@ -63,9 +64,10 @@ class TRKLayer
   float mChipLength;
   float mChipThickness;
   float mDeadzoneWidth;
+  float mSensorThickness;
   int mHalfNumberOfChips;
 
-  ClassDef(TRKLayer, 1);
+  ClassDef(TRKLayer, 2);
 };
 
 } // namespace trk

Detectors/Upgrades/ALICE3/TRK/simulation/src/TRKLayer.cxx

@@ -26,15 +26,15 @@ namespace o2
 namespace trk
 {
 TRKLayer::TRKLayer(int layerNumber, std::string layerName, float rInn, float rOut, int numberOfModules, float layerX2X0)
-  : mLayerNumber(layerNumber), mLayout(kCylinder), mLayerName(layerName), mInnerRadius(rInn), mOuterRadius(rOut), mNumberOfModules(numberOfModules), mX2X0(layerX2X0), mChipWidth(constants::moduleMLOT::chip::width), mChipLength(constants::moduleMLOT::chip::length), mDeadzoneWidth(1.5 * 1e-1), mHalfNumberOfChips(4)
+  : mLayerNumber(layerNumber), mLayout(kCylinder), mLayerName(layerName), mInnerRadius(rInn), mOuterRadius(rOut), mNumberOfModules(numberOfModules), mX2X0(layerX2X0), mChipWidth(constants::moduleMLOT::chip::width), mChipLength(constants::moduleMLOT::chip::length), mDeadzoneWidth(1.5 * 1e-1), mSensorThickness(100.e-4), mHalfNumberOfChips(4)
 {
   float Si_X0 = 9.5f;
   mChipThickness = mX2X0 * Si_X0;
   LOGP(info, "Creating layer: id: {} rInner: {} rOuter: {} zLength: {} x2X0: {}", mLayerNumber, mInnerRadius, mOuterRadius, getZ(), mX2X0);
 }
 
 TRKLayer::TRKLayer(int layerNumber, std::string layerName, float rInn, int numberOfModules, float thick)
-  : mLayerNumber(layerNumber), mLayout(kCylinder), mLayerName(layerName), mInnerRadius(rInn), mNumberOfModules(numberOfModules), mChipThickness(thick), mChipWidth(constants::moduleMLOT::chip::width), mChipLength(constants::moduleMLOT::chip::length), mDeadzoneWidth(1.5 * 1e-1), mHalfNumberOfChips(4)
+  : mLayerNumber(layerNumber), mLayout(kCylinder), mLayerName(layerName), mInnerRadius(rInn), mNumberOfModules(numberOfModules), mChipThickness(thick), mChipWidth(constants::moduleMLOT::chip::width), mChipLength(constants::moduleMLOT::chip::length), mDeadzoneWidth(1.5 * 1e-1), mSensorThickness(100.e-4), mHalfNumberOfChips(4)
 {
   float Si_X0 = 9.5f;
   mOuterRadius = rInn + thick;
@@ -50,9 +50,9 @@ TGeoVolume* TRKLayer::createSensor(std::string type)
   TGeoShape* sensor;
 
   if (type == "cylinder") {
-    sensor = new TGeoTube(mInnerRadius, mInnerRadius + mChipThickness, mChipLength / 2); // TO BE CHECKED !!!
+    sensor = new TGeoTube(mInnerRadius, mInnerRadius + mSensorThickness, mChipLength / 2); // TO BE CHECKED !!!
   } else if (type == "flat") {
-    sensor = new TGeoBBox((mChipWidth - mDeadzoneWidth) / 2, mChipThickness / 2, mChipLength / 2); // TO BE CHECKED !!!
+    sensor = new TGeoBBox((mChipWidth - mDeadzoneWidth) / 2, mSensorThickness / 2, mChipLength / 2); // TO BE CHECKED !!!
   } else {
     LOGP(fatal, "Sensor of type '{}' is not implemented", type);
   }
@@ -71,9 +71,9 @@ TGeoVolume* TRKLayer::createDeadzone(std::string type)
   TGeoShape* deadzone;
 
   if (type == "cylinder") {
-    deadzone = new TGeoTube(mInnerRadius, mInnerRadius + mChipThickness, mChipLength / 2); // TO BE CHECKED !!!
+    deadzone = new TGeoTube(mInnerRadius, mInnerRadius + mSensorThickness, mChipLength / 2); // TO BE CHECKED !!!
   } else if (type == "flat") {
-    deadzone = new TGeoBBox(mDeadzoneWidth / 2, mChipThickness / 2, mChipLength / 2); // TO BE CHECKED !!!
+    deadzone = new TGeoBBox(mDeadzoneWidth / 2, mSensorThickness / 2, mChipLength / 2); // TO BE CHECKED !!!
   } else {
     LOGP(fatal, "Deadzone of type '{}' is not implemented", type);
   }
@@ -84,6 +84,27 @@ TGeoVolume* TRKLayer::createDeadzone(std::string type)
   return deadVol;
 };
 
+TGeoVolume* TRKLayer::createMetalStack(std::string type)
+{
+  TGeoMedium* medSi = gGeoManager->GetMedium("TRK_SILICON$");
+  std::string metalName = GeometryTGeo::getTRKMetalStackPattern() + std::to_string(mLayerNumber);
+
+  TGeoShape* metalStack;
+
+  if (type == "cylinder") {
+    metalStack = new TGeoTube(mInnerRadius + mSensorThickness, mInnerRadius + mChipThickness, mChipLength / 2); // TO BE CHECKED !!!
+  } else if (type == "flat") {
+    metalStack = new TGeoBBox(mChipWidth / 2, mChipThickness - mSensorThickness / 2, mChipLength / 2); // TO BE CHECKED !!!
+  } else {
+    LOGP(fatal, "Metal stack of type '{}' is not implemented", type);
+  }
+
+  TGeoVolume* metalVol = new TGeoVolume(metalName.c_str(), metalStack, medSi);
+  metalVol->SetLineColor(kGray);
+
+  return metalVol;
+};
+
 TGeoVolume* TRKLayer::createChip(std::string type)
 {
   TGeoMedium* medSi = gGeoManager->GetMedium("TRK_SILICON$");
@@ -94,14 +115,24 @@ TGeoVolume* TRKLayer::createChip(std::string type)
 
   TGeoVolume* sensVol;
   TGeoVolume* deadVol;
+  TGeoVolume* metalVol;
 
   if (type == "cylinder") {
     chip = new TGeoTube(mInnerRadius, mInnerRadius + mChipThickness, mChipLength / 2);
     chipVol = new TGeoVolume(chipName.c_str(), chip, medSi);
 
     sensVol = createSensor("cylinder");
+    metalVol = createMetalStack("cylinder");
+
+    TGeoCombiTrans* transSens = new TGeoCombiTrans();
+    transSens->SetTranslation(0, -(mChipThickness - mSensorThickness) / 2, 0); // TO BE CHECKED !!!
     LOGP(info, "Inserting {} in {} ", sensVol->GetName(), chipVol->GetName());
-    chipVol->AddNode(sensVol, 1, nullptr);
+    chipVol->AddNode(sensVol, 1, transSens);
+
+    TGeoCombiTrans* transMetal = new TGeoCombiTrans();
+    transMetal->SetTranslation(0, mSensorThickness / 2, 0); // TO BE CHECKED !!!
+    LOGP(info, "Inserting {} in {} ", metalVol->GetName(), chipVol->GetName());
+    chipVol->AddNode(metalVol, 1, transMetal);
 
     // deadVol = createDeadzone("cylinder");
   } else if (type == "flat") {
@@ -110,16 +141,22 @@ TGeoVolume* TRKLayer::createChip(std::string type)
 
     sensVol = createSensor("flat");
     deadVol = createDeadzone("flat");
+    metalVol = createMetalStack("flat");
 
     TGeoCombiTrans* transSens = new TGeoCombiTrans();
-    transSens->SetTranslation(-mDeadzoneWidth / 2, 0, 0); // TO BE CHECKED !!!
+    transSens->SetTranslation(-mDeadzoneWidth / 2, -(mChipThickness - mSensorThickness) / 2, 0); // TO BE CHECKED !!!
     LOGP(info, "Inserting {} in {} ", sensVol->GetName(), chipVol->GetName());
     chipVol->AddNode(sensVol, 1, transSens);
 
     TGeoCombiTrans* transDead = new TGeoCombiTrans();
-    transDead->SetTranslation((mChipWidth - mDeadzoneWidth) / 2, 0, 0); // TO BE CHECKED !!!
+    transDead->SetTranslation((mChipWidth - mDeadzoneWidth) / 2, -(mChipThickness - mSensorThickness) / 2, 0); // TO BE CHECKED !!!
     LOGP(info, "Inserting {} in {} ", deadVol->GetName(), chipVol->GetName());
     chipVol->AddNode(deadVol, 1, transDead);
+
+    TGeoCombiTrans* transMetal = new TGeoCombiTrans();
+    transMetal->SetTranslation(0, mSensorThickness / 2, 0); // TO BE CHECKED !!!
+    LOGP(info, "Inserting {} in {} ", metalVol->GetName(), chipVol->GetName());
+    chipVol->AddNode(metalVol, 1, transMetal);
   } else {
     LOGP(fatal, "Sensor of type '{}' is not implemented", type);
   }
@@ -169,6 +206,9 @@ TGeoVolume* TRKLayer::createModule(std::string type)
 
       TGeoCombiTrans* transRight = new TGeoCombiTrans();
       transRight->SetTranslation(xRight, 0, zRight); // TO BE CHECKED !!!
+      TGeoRotation* rot = new TGeoRotation();
+      rot->RotateY(180);
+      transRight->SetRotation(rot);
       LOGP(info, "Inserting {} in {} ", chipVolRight->GetName(), moduleVol->GetName());
       moduleVol->AddNode(chipVolRight, iChip * 2 + 1, transRight);
     }
@@ -266,26 +306,6 @@ TGeoVolume* TRKLayer::createStave(std::string type)
     stave = new TGeoBBox(staveWidth / 2, mLogicalVolumeThickness / 2, staveLength / 2);
     staveVol = new TGeoVolume(staveName.c_str(), stave, medAir);
 
-    /*for (int iModule = 0; iModule < mNumberOfModules; iModule++) {
-      TGeoVolume* moduleVolLeft = createModule("flat");
-      TGeoVolume* moduleVolRight = createModule("flat");
-
-      // Put the modules in the correct position
-      double xLeft = -moduleWidth / 2 + 0.05;
-      double xRight = moduleWidth / 2 - 0.05;
-      double zPos = -0.5 * mNumberOfModules * moduleLength + (iModule + 0.5) * moduleLength;
-
-      TGeoCombiTrans* transLeft = new TGeoCombiTrans();
-      transLeft->SetTranslation(xLeft, 0, zPos); // TO BE CHECKED !!! 1mm overlap between the modules
-      LOGP(info, "Inserting {} in {} ", moduleVolLeft->GetName(), staveVol->GetName());
-      staveVol->AddNode(moduleVolLeft, iModule * 2, transLeft);
-
-      TGeoCombiTrans* transRight = new TGeoCombiTrans();
-      transRight->SetTranslation(xRight, 0.2, zPos); // TO BE CHECKED !!! 1mm overlap between the modules
-      LOGP(info, "Inserting {} in {} ", moduleVolRight->GetName(), staveVol->GetName());
-      staveVol->AddNode(moduleVolRight, iModule * 2 + 1, transRight);
-    }*/
-
     // Put the half staves in the correct position
     TGeoVolume* halfStaveVolLeft = createHalfStave("flat");
     TGeoVolume* halfStaveVolRight = createHalfStave("flat");