From b27787f2fd42f766aeea402e1e99d8aed4e397c5 Mon Sep 17 00:00:00 2001
From: adrien-matta <a.matta@surrey.ac.uk>
Date: Wed, 7 May 2014 14:46:29 +0100
Subject: [PATCH] * Updated AnnularS1 geometry
---
NPSimulation/AnnularS1/AnnularS1.cc | 11 +++++++++--
NPSimulation/AnnularS1/AnnularS1.hh | 9 +++++----
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/NPSimulation/AnnularS1/AnnularS1.cc b/NPSimulation/AnnularS1/AnnularS1.cc
index f16e9fe97..b95bfc272 100644
--- a/NPSimulation/AnnularS1/AnnularS1.cc
+++ b/NPSimulation/AnnularS1/AnnularS1.cc
@@ -240,15 +240,22 @@ void AnnularS1::VolumeMaker(G4int DetecNumber,
0*deg,
360*deg);
+
+ G4ThreeVector activecutposition1(80*mm+ActiveWaferRCut,0,0); activecutposition1.setPhi(45*deg);
+ G4Transform3D activetransform1(*cutrotation,activecutposition1);
+
G4SubtractionSolid* solidActiveWafer1 = new G4SubtractionSolid("ActiveWafer1",
solidActiveWaferBase,
solidCutout,
- transform1);
+ activetransform1);
+ G4ThreeVector activecutposition2(-80*mm-ActiveWaferRCut,0,0); activecutposition2.setPhi(-135*deg);
+ G4Transform3D activetransform2(*cutrotation,activecutposition2);
+
G4SubtractionSolid* solidActiveWafer = new G4SubtractionSolid("ActiveWafer",
solidActiveWafer1,
solidCutout,
- transform2);
+ activetransform2);
G4LogicalVolume* logicActiveWafer = new G4LogicalVolume(solidActiveWafer, Silicon, "AnnularS1_ActiveWafer", 0, 0, 0);
new G4PVPlacement(G4Transform3D(*norotation, G4ThreeVector()),
diff --git a/NPSimulation/AnnularS1/AnnularS1.hh b/NPSimulation/AnnularS1/AnnularS1.hh
index df66e158a..6b41b5447 100644
--- a/NPSimulation/AnnularS1/AnnularS1.hh
+++ b/NPSimulation/AnnularS1/AnnularS1.hh
@@ -25,7 +25,7 @@
// C++ headers
#include <vector>
using namespace std;
-
using namespace CLHEP;
+using namespace CLHEP;
// NPTool header
#include "VDetector.hh"
@@ -117,18 +117,19 @@ namespace ANNULARS1{
const G4double ResoTime = 0.106382979 ;// = 250 ps // Unit is ns/2.35
const G4double EnergyThreshold = 0.300 ;// = 300 keV
// PCB
- const G4double PCBPointsX[8]={-50,50,60,60,50,-50,-60,-60};
- const G4double PCBPointsY[8]={60,60,50,-50,-60,-60,-50,50};
+ const G4double PCBPointsX[8]={-40,40,60,60,40,-40,-60,-60};
+ const G4double PCBPointsY[8]={60,60,40,-40,-60,-60,-40,40};
const G4double PCBThickness=2*mm;
const G4double PCBInnerRadius=20*mm;
// Wafer
const G4double WaferOutterRadius = 50*mm;
const G4double WaferInnerRadius = 23*mm;
const G4double WaferThickness = 500*micrometer;
- const G4double WaferRCut = 45*mm;
+ const G4double WaferRCut = 45.5*mm;
const G4double ActiveWaferOutterRadius = 48*mm;
const G4double ActiveWaferInnerRadius = 24*mm;
const G4double AluStripThickness = 0.4*micrometer;
+ const G4double ActiveWaferRCut = 44.5*mm;
// Characteristics
const G4int NbrRingStrips = 16;
--
GitLab