From 2cb29b1cf28b23c5141835610562cb6e9500db52 Mon Sep 17 00:00:00 2001
From: Peter DeRosa <54421997+MagnusSnowleopard@users.noreply.github.com>
Date: Fri, 14 Oct 2022 17:45:03 -0400
Subject: [PATCH] added BGOs, needs to be sensitive now

---
 .CloverDetectorConstruction.cc.swo | Bin 20480 -> 0 bytes
 .Detector_Parameters.hh.swp        | Bin 12288 -> 0 bytes
 CloverDetectorConstruction.cc      |  80 +++++++++++++++++++----------
 Detector_Parameters.hh             |  48 ++++++++---------
 4 files changed, 76 insertions(+), 52 deletions(-)
 delete mode 100644 .CloverDetectorConstruction.cc.swo
 delete mode 100644 .Detector_Parameters.hh.swp

diff --git a/.CloverDetectorConstruction.cc.swo b/.CloverDetectorConstruction.cc.swo
deleted file mode 100644
index e9833596d616c7df295953183561ddffdfa7169d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20480
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
Y2}&%ydK}X^Csm$Z6gG{I4XR8338Auv*Z=?k

diff --git a/.Detector_Parameters.hh.swp b/.Detector_Parameters.hh.swp
deleted file mode 100644
index b1b499d4cf737cd1d74e1f2ef403ad491bdbe3fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2&5smC6u=9N2ULXM(XXc@f~L2+t3T!=t0b}*+yr4|$33`^NlkYRT}e;(*j+tj
zS&?uj;Y>XF7jS{Z6P$?NJQ38ye?V`XIq-UVhU^$O(0jwYN`BMn>VEZJ{ieH;$<)Bv
zSp5n*+-2AfGxp2+m*Jtuw_ka1h_SIUDzEyV)1o*W3vBIxkK?UEhXo%NC09|o82H0<
zK>Jj7IZZMd74~T*Q{#W#J6Y-^vRBS*^uAc{*<q4RRNf!S0@KgV>{D1vXtKP&CUZHe
z3M+UVFOE-VWPl9pVxTm`rOrX-xx%ULIQroS@Ya!UcDb3l$p9H317v^<kO4A42FL&z
z_&*vj<9+NJPHg{da-YnO`~G#Dozj5}kO4A42FL&zAOmE843GgbKnBPF8F&c|$cVAc
z1B|`@8WxZL|IdH_|AYVk|Bd{H+(CXqZX(|!G15a$BA+Ask$Z14_A_!9nIK){$w9{M
zBiE4?<W=O?HyFEttRY8`hp#hs3%P&*@)y?eC-MjKJMswm5xI_hj2uUfAs-=C&F>-a
zBJUt?Bh<(M86X2>fDDiUGC&6QY~X0sR2u1FH3UGIrG<egD+h^!^D@$90iS{EID8pw
z`&(E$x4zn2J$DwCmLRV$%gb^LhIuvuBlAnjSfEoF=|s<Va01}CyEME~XVj^Im3*r(
zGU=Z!N0_taR~aFe1(*y53L-txg|6xvY=O_AE*M96!L}^|%g0TyfhC+a_X5k|SFbMH
zw$)?^-x6+@TcYFeD!x&yH&4HpVAtwm%0O`6ZJbz4V?C$CgLdO!XI8c6aZfaj?oKm{
zz~^qKX>6yCbzI(=epgLgw=EH%E+JZb@YS+}CwM!s_B7@BL*@o9Z~09p?aytyE#7LZ
z%&U|+mg@w(-T1qjK4BOfw7F<px2T1?zPIBUTUbn1>K)%_vQQeGrJJI4anrwuFZ%Yj
z^GrC-y4#vNtKLi7u0NsPFb-)s8mJsBFtIYyf^n=Z$W?-4P83{OiZm`EX{f3-18<ov
zVf7fvEHy;ZNRWA6ty@_RN`~>X@s*0^3r?X7#41<IxRX|=VNym4KAlW=sGr!;Q<z+*
zmw3F`7bSYI*cTS2>fCu-)upqYJ=2b9T%?9NRnYHiIg(|nzbloF`f<OHsfQ_E{jW>R
UwofP7Kqjyub1iYPEO4QG3LQ|AWdHyG

diff --git a/CloverDetectorConstruction.cc b/CloverDetectorConstruction.cc
index 0449219..811d110 100644
--- a/CloverDetectorConstruction.cc
+++ b/CloverDetectorConstruction.cc
@@ -9,6 +9,7 @@
 #include "G4Box.hh"
 #include "G4Tubs.hh"
 #include "G4Sphere.hh"
+#include "G4Trd.hh"
 #include "G4IntersectionSolid.hh"
 #include "G4SubtractionSolid.hh"
 
@@ -120,9 +121,19 @@ G4VPhysicalVolume* CloverDetectorConstruction::DefineVolumes()
 
   //Clover casing
   G4double caseXYInner = 2*(cutXY + 1.0) * mm;
-  G4double caseZInner  = crystalLength/2 + 4 * mm + crystalLength + 15*mm;
+  G4double caseZInner  = crystalLength/2 + crystalLength + 10*mm;
   G4double caseXYWallThickness = 3.0 * mm;
   G4double caseZWallThickness = 3.0 * mm;
+
+
+  //BGO Detector 
+  
+  G4double bgoXYInner = 10*mm + 2*(cutXY + 1.0) * mm;
+  G4double bgoZInner  = crystalLength/2 + 4 * mm + crystalLength + 15*mm;
+  G4double bgoXYWallThickness = 103.5 * mm; //from schematic
+  G4double bgoanglecut = 53 * mm;
+  
+
   
   // Get materials
   auto backgroundMaterial = G4Material::GetMaterial("G4_AIR");
@@ -154,10 +165,6 @@ G4VPhysicalVolume* CloverDetectorConstruction::DefineVolumes()
   G4RotationMatrix * rotX = new G4RotationMatrix(); rotX->rotateX(90*degree);
   G4RotationMatrix * rotY = new G4RotationMatrix(); rotY->rotateY(90*degree);
   
-  //G4SubtractionSolid * pipe1 = new G4SubtractionSolid("Pipe1", pipe, pipe0, rotY, G4ThreeVector());
-
- // G4LogicalVolume * pipe1LV = new G4LogicalVolume( pipe1, G4Material::GetMaterial("G4_Fe"), "Pipe");
- // G4LogicalVolume * pipe2LV = new G4LogicalVolume( pipe, G4Material::GetMaterial("G4_Fe"), "Pipe2");
   G4LogicalVolume * chamberLV = new G4LogicalVolume(chamber, G4Material::GetMaterial("G4_Fe"),"targetchamber");
   
   new G4PVPlacement( 0,                // no rotation
@@ -168,19 +175,8 @@ G4VPhysicalVolume* CloverDetectorConstruction::DefineVolumes()
                      false,            // no boolean operation
                      0,                // copy number
                      fCheckOverlaps);  // checking overlaps
-  /*                   
-  new G4PVPlacement( rotY,                // no rotation
-                     G4ThreeVector(0, 0, pipeZPos),  // at (0,0,0)
-                     pipe2LV,          // its logical volume                         
-                     "Pipe2",          // its name
-                     worldLV,          // its mother  volume
-                     false,            // no boolean operation
-                     0,                // copy number
-                     fCheckOverlaps);  // checking overlaps
-  */
- // pipe1LV->SetVisAttributes(new G4VisAttributes(G4Colour(1.0,1.0,1.0)));
- // pipe2LV->SetVisAttributes(new G4VisAttributes(G4Colour(1.0,1.0,1.0)));
-    chamberLV->SetVisAttributes(new G4VisAttributes(G4Colour(1.0,1.0,1.0)));
+    
+  chamberLV->SetVisAttributes(new G4VisAttributes(G4Colour(1.0,1.0,1.0)));
   
 
   // Crystals
@@ -197,8 +193,18 @@ G4VPhysicalVolume* CloverDetectorConstruction::DefineVolumes()
   G4Box* case2 = new G4Box("case2", (caseXYInner + caseXYWallThickness)/2. , (caseXYInner + caseXYWallThickness)/2., caseZInner + caseZWallThickness*2.);
   G4SubtractionSolid * casing = new G4SubtractionSolid("casing", case2, case1);
   
+  G4Box* bgo1 = new G4Box("bgo1", bgoXYInner/2., bgoXYInner/2., bgoZInner +10*mm);
+ 
+  G4Trd* bgo2 = new G4Trd("bgo2", (bgoXYInner+ bgoXYWallThickness)/2.  - bgoanglecut ,(bgoXYInner+ bgoXYWallThickness)/2.
+                                , (bgoXYInner + bgoXYWallThickness)/2. - bgoanglecut, (bgoXYInner + bgoXYWallThickness)/2., bgoZInner);
+  //G4Box* bgo2 = new G4Box("bgo2", (bgoXYInner+ bgoXYWallThickness)/2., (bgoXYInner + bgoXYWallThickness)/2., bgoZInner + bgoZWallThickness*2.);
+ 
+  G4SubtractionSolid * bgo = new G4SubtractionSolid("bgo", bgo2, bgo1);
+ 
+  // creating the subtraction solid that will form the actual bgo sheild.
 
-
+  
+  
   double dTheta,dPsi,zmod; 
 
   for( G4int i = 0 ; i < fNumOfCrystal ; i++){ 
@@ -216,7 +222,7 @@ G4VPhysicalVolume* CloverDetectorConstruction::DefineVolumes()
 
 
     auto caseLV =  new G4LogicalVolume * [fNumOfCrystal/4];
-   // auto caseLV = new G4LogicalVolume(casing, G4Material::GetMaterial("G4_Al"), "Case")[i/4+1];
+    auto bgoLV  =  new G4LogicalVolume * [fNumOfCrystal/4];
 
     fLogicCrystal[i]->SetVisAttributes(crystalVisAtt);
 
@@ -237,10 +243,13 @@ G4VPhysicalVolume* CloverDetectorConstruction::DefineVolumes()
 //    if(iClover != DetNum){return 0;}
 
 
-    G4ThreeVector case_pos = G4ThreeVector(0,0,100*mm+crystalZPos + zmod); //The crystalZpos is the radius of the detectors. 
- 
+    G4ThreeVector case_pos = G4ThreeVector(0,0,60*mm+crystalZPos + zmod); //The crystalZpos is the radius of the detector,
+                                                                           //bgo uses the same position vector and rotation matrix as the case
+    G4ThreeVector bgo_pos = G4ThreeVector(0,0,60*mm+crystalZPos + zmod);
+                                                                          
     //Set rotation matrix settings for clovers.
     
+    G4RotationMatrix * bgomat = new G4RotationMatrix(); 
     G4RotationMatrix * rotmat = new G4RotationMatrix(); 
     G4RotationMatrix * crystalmat= new G4RotationMatrix();
 
@@ -249,26 +258,30 @@ G4VPhysicalVolume* CloverDetectorConstruction::DefineVolumes()
   
     for(int j = 0; j <= iClover;j++){
         if(j == iClover){
-  //  rotmat->rotateY(yangc *degree);
-  
+ 
+    // rotation matrix must undo the operations you perform with the position vector. 
+
+    bgomat->rotateZ(-dPsi*degree);
+    bgomat->rotateX(-dTheta*degree);
+   
     rotmat->rotateZ(-dPsi*degree);
     rotmat->rotateX(-dTheta*degree);
    
-  //  crystalmat->rotateY(yang*degree);
     crystalmat->rotateZ(-dPsi*degree);
     crystalmat->rotateX(-dTheta*degree);
    
     //rotate position vector based on iClover.
 
-  //  pos.rotateY(dPhi*degree);
     pos.rotateX(dTheta*degree);
     pos.rotateZ(dPsi *degree);
 
     //set rotation for the detector case vector; 
 
-  //  case_pos.rotateY(dPhi*degree); 
     case_pos.rotateX(dTheta *degree); 
     case_pos.rotateZ(dPsi*degree); 
+    
+    bgo_pos.rotateX(dTheta *degree); 
+    bgo_pos.rotateZ(dPsi*degree); 
         }
     }
     new G4PVPlacement( crystalmat,     // orientation matrix
@@ -283,7 +296,9 @@ G4VPhysicalVolume* CloverDetectorConstruction::DefineVolumes()
     
   if( jCrystal  == 0 ) {  
       caseLV[iClover]  = new G4LogicalVolume(casing, G4Material::GetMaterial("G4_Al"), "Case");
-  new G4PVPlacement( rotmat ,                // case orientation
+      bgoLV[iClover]   = new G4LogicalVolume(bgo   , G4Material::GetMaterial("G4_Al"), "BGO ");
+     
+      new G4PVPlacement( rotmat ,                // case orientation
                      case_pos,          // case location
                      caseLV[i/4],           // its logical volume                         
                      "Casing",         // its name
@@ -292,7 +307,16 @@ G4VPhysicalVolume* CloverDetectorConstruction::DefineVolumes()
                      iClover,                // copy number
                      fCheckOverlaps);  // checking overlaps
   
+      new G4PVPlacement( bgomat ,      // bgo orientation
+                     bgo_pos,          // bgo location
+                     bgoLV[i/4],      // its logical volume                         
+                     "Bgo",         // its name
+                     worldLV,          // its mother  volume
+                     false,            // no boolean operation
+                     iClover,                // copy number
+                     fCheckOverlaps);  // checking overlaps
   caseLV[iClover]->SetVisAttributes(new G4VisAttributes(G4Colour(1.0,1.0,0.0)));
+  bgoLV[iClover]->SetVisAttributes(new G4VisAttributes(G4Colour(0.,1.0,0.0)));
     }
        //Set a i+1%4 for each 
      //
diff --git a/Detector_Parameters.hh b/Detector_Parameters.hh
index 851a2aa..295f129 100644
--- a/Detector_Parameters.hh
+++ b/Detector_Parameters.hh
@@ -9,33 +9,33 @@
 #include <string.h>
 #include <vector>
 
-   //location data array for each clover needs to be set here;
-   // clover number , theta, phi, relative z-distance to the Radius
-   //
-  
-  const double Clover_Location[16][4] = {{0,131.75,326.96,0.},
-                                         {1,150.,243.57,0.},
-                                         {2,90.0,257.14,0.},
-                                         {3,90.0,205.71,0.},
-                                         {4,48.25,326.68,0.},
-                                         {5,48.25,252.64,0.},
-                                         {6,131.75,33.31,0.},
-                                         {7,150.,116.42,0.},
-                                         {8,90.,102.85,0.},
-                                         {9,90.,154.28,0.},
-                                         {10,48.25,33.31,0.},
-                                         {11,90.,308.57,0.},
-                                         {12,90.,51.42,0.},
-                                         {13,48.25,180.,0.},
-                                         {14,129.,180.,0.},
-                                         {15,48.25,107.35,0.}};//,
-  
+const int Crystal_Num = 64; // has to be divisible by 4. 
+
+const double Radius = 200.; //Z POSITION -- radius away from target, in milimeters.  
+                            //location data array for each clover needs to be set here;
+                            // clover number , theta, phi, relative z-distance to the Radius
+                            //
+
+const double Clover_Location[Crystal_Num/4][4] = {{0,131.75,326.96,0.}, 
+    {1,150.,243.57,0.},
+    {2,90.0,257.14,0.},
+    {3,90.0,205.71,0.},
+    {4,48.25,326.68,0.},
+    {5,48.25,252.64,0.},
+    {6,131.75,33.31,0.},
+    {7,150.,116.42,0.},
+    {8,90.,102.85,0.},
+    {9,90.,154.28,0.},
+    {10,48.25,33.31,0.},
+    {11,90.,308.57,0.},
+    {12,90.,51.42,0.},
+    {13,48.25,180.,0.},
+    {14,129.,180.,0.},
+    {15,48.25,107.35,0.}};//,
+
 
 
 
-  const int Crystal_Num = 64; // has to be divisible by 4. 
-                         
-  const double Radius = 200.; //Z POSITION -- radius away from target, in milimeters.