move detector parameters to header

This commit is contained in:
2021-01-15 12:48:37 -06:00
parent 4c6a00e681
commit 64e5709311
2 changed files with 48 additions and 22 deletions

View File

@@ -22,6 +22,32 @@ class DetectorConstruction : public G4VUserDetectorConstruction
protected:
// void DefineMaterials();
G4bool fCheckOverlaps;
G4double scSizeX;
G4double scSizeY;
G4double scSizeZ;
G4double scGapX;
G4double scGapZ;
G4int nScBar;
G4int nLayerTop;
G4int nLayerBottom;
G4double layerGapZ;
G4double topBotGap;
G4double layerSizeX;
G4double layerSizeY;
G4double layerSizeZ;
G4double concreteX;
G4double concreteY;
G4double concreteZ;
G4double targetX;
G4double targetY;
G4double targetZ;
G4double worldSizeX;
G4double worldSizeY;
G4double worldSizeZ;
};
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

View File

@@ -35,32 +35,32 @@ G4VPhysicalVolume *DetectorConstruction::Construct() {
nist->FindOrBuildMaterial("G4_PLASTIC_SC_VINYLTOLUENE");
// World and crystals
G4double scSizeX = 5.0 * cm;
G4double scSizeY = 50.0 * cm;
G4double scSizeZ = 1. * cm;
G4double scGapX = 0.2 * cm;
G4double scGapZ = 0.2 * cm;
G4int nScBar = 10;
G4int nLayerTop = 2;
G4int nLayerBottom = 2;
scSizeX = 5.0 * cm;
scSizeY = 50.0 * cm;
scSizeZ = 1. * cm;
scGapX = 0.2 * cm;
scGapZ = 0.2 * cm;
nScBar = 10;
nLayerTop = 2;
nLayerBottom = 2;
G4double layerGapZ = 1 * cm;
G4double topBotGap = 50 * cm;
layerGapZ = 1 * cm;
topBotGap = 50 * cm;
G4double layerSizeX = nScBar * scSizeX + nScBar * scGapX;
G4double layerSizeY = nScBar * scSizeX + nScBar * scGapX;
G4double layerSizeZ = scSizeZ + scGapZ;
layerSizeX = nScBar * scSizeX + nScBar * scGapX;
layerSizeY = nScBar * scSizeX + nScBar * scGapX;
layerSizeZ = scSizeZ + scGapZ;
G4double concreteX = 30 * cm;
G4double concreteY = 30 * cm;
G4double concreteZ = 30 * cm;
G4double targetX = 10 * cm;
G4double targetY = 10 * cm;
G4double targetZ = 5 * cm;
concreteX = 30 * cm;
concreteY = 30 * cm;
concreteZ = 30 * cm;
targetX = 10 * cm;
targetY = 10 * cm;
targetZ = 5 * cm;
G4double worldSizeX = 1.2 * layerSizeX;
G4double worldSizeY = 1.2 * layerSizeY;
G4double worldSizeZ =
worldSizeX = 1.2 * layerSizeX;
worldSizeY = 1.2 * layerSizeY;
worldSizeZ =
1.2 * ((nLayerBottom + nLayerTop) * (layerSizeZ + layerGapZ) + topBotGap);
// world volume