SiPM position fix and changes on scintillator mother volume
This commit is contained in:
parent
9b2d6fcf08
commit
c40abc752c
66
README.md
66
README.md
|
|
@ -9,7 +9,7 @@ The output file is a ROOT file. Can be checked by TBrowser.
|
||||||
* CERN Geant4
|
* CERN Geant4
|
||||||
* CERN Root (tested on 6.19/01)
|
* CERN Root (tested on 6.19/01)
|
||||||
* Linux or MacOS (should work on Windows, not tested)
|
* Linux or MacOS (should work on Windows, not tested)
|
||||||
* Also tested on WLS Ubuntu (X11 needed)
|
* Also tested on WLS Ubuntu (X11 (for e.g. VcXsrv) and OpenGL needed)
|
||||||
|
|
||||||
## Building
|
## Building
|
||||||
Before building, be sure that you changed the macroPath to the right directory in sipm.cc.
|
Before building, be sure that you changed the macroPath to the right directory in sipm.cc.
|
||||||
|
|
@ -20,7 +20,63 @@ cmake ../SiPM
|
||||||
make -jN (where N is the number of jobs to run simultaneously)
|
make -jN (where N is the number of jobs to run simultaneously)
|
||||||
```
|
```
|
||||||
|
|
||||||
## Updates
|
## Running
|
||||||
* 2020/02/06 - SiPMAnalisys' and SiPMParameters' GetInstance functions are returning a static reference instead of pointer
|
Run with default parameters (not always works)
|
||||||
* 2020/02/06 - G4Mutex replaced with std::mutex
|
```
|
||||||
* 2020/02/06 - Input config file and output data file name can be changed with the GetInstance functions on the first call
|
./sipm
|
||||||
|
```
|
||||||
|
Run with default config file (config.conf)
|
||||||
|
```
|
||||||
|
./sipm -df
|
||||||
|
```
|
||||||
|
Run with custom config file
|
||||||
|
```
|
||||||
|
./sipm -f config_file_name.conf
|
||||||
|
```
|
||||||
|
|
||||||
|
## Config file parameters
|
||||||
|
* pgpositionx - Particle Gun X position
|
||||||
|
* pgpositiony - Particle Gun Y position
|
||||||
|
* pgpositionz - Particle Gun Z position
|
||||||
|
* pgmomentumx - Particle Gun X momentum
|
||||||
|
* pgmomentumy - Particle Gun Y momentum
|
||||||
|
* pgmomentumz - Particle Gun Z momentum
|
||||||
|
* sipmsizex - SiPM X Size
|
||||||
|
* sipmsizey - SiPM Y Size
|
||||||
|
* sipmsizez - SiPM Z Size
|
||||||
|
* scintillatorsizex - Scintillator X Size
|
||||||
|
* scintillatorsizey - Scintillator Y Size
|
||||||
|
* scintillatorlength - Scintillator Z Size
|
||||||
|
* scintillatorisbox - Scintillator can be a tube or a box
|
||||||
|
* coatingthickness - Scintillator coating thickness
|
||||||
|
* scintillatorradius - Radius of the scintillator. Only used when it is a tube.
|
||||||
|
* xdivision - How many detectors should be placed along the X axis
|
||||||
|
* ydivision - How many detectors should be placed along the Y axis
|
||||||
|
* pgenergy - Particle Gun energy
|
||||||
|
* numberofevents - Number of events
|
||||||
|
* lengthunit - Size unit in detector construction (mm | cm | m)
|
||||||
|
* firstsipmenabled - Enable the first SiPM
|
||||||
|
* secondsipmenabled - Enable the second SiPM
|
||||||
|
|
||||||
|
# Changelog
|
||||||
|
## 2020-04-08
|
||||||
|
* SiPM position fix
|
||||||
|
* Changed scintillator mother volume
|
||||||
|
|
||||||
|
## 2020-02-19
|
||||||
|
* Scintillator subtracted from it's coating
|
||||||
|
* Scintillation process fix
|
||||||
|
* Size and position fixes
|
||||||
|
* Print fixes in Parameters
|
||||||
|
|
||||||
|
## 2020-02-18
|
||||||
|
* Both SiPMs can be enabled or disabled
|
||||||
|
* Added an option to change between a box and tube scintillator (only box tested yet)
|
||||||
|
* Added new parameters
|
||||||
|
* Cleaned up the detector construction
|
||||||
|
* Small changes according to the new parameters
|
||||||
|
|
||||||
|
## 2020-02-06
|
||||||
|
* SiPMAnalisys' and SiPMParameters' GetInstance functions are returning a static reference instead of pointer
|
||||||
|
* G4Mutex replaced with std::mutex
|
||||||
|
* Input config file and output data file name can be changed with the GetInstance functions on the first call
|
||||||
|
|
|
||||||
|
|
@ -4,19 +4,22 @@
|
||||||
//
|
//
|
||||||
// Created by Baranyai David on 2018. 08. 22..
|
// Created by Baranyai David on 2018. 08. 22..
|
||||||
//
|
//
|
||||||
|
// 2020.02.07 - SiPM size fixed
|
||||||
|
// - Scintillator is now a box
|
||||||
|
|
||||||
#include "SiPMDetectorConstruction.hh"
|
#include "SiPMDetectorConstruction.hh"
|
||||||
|
|
||||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||||
|
|
||||||
SiPMDetectorConstruction::SiPMDetectorConstruction()
|
SiPMDetectorConstruction::SiPMDetectorConstruction() : G4VUserDetectorConstruction()
|
||||||
: G4VUserDetectorConstruction()
|
{
|
||||||
{ }
|
}
|
||||||
|
|
||||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||||
|
|
||||||
SiPMDetectorConstruction::~SiPMDetectorConstruction()
|
SiPMDetectorConstruction::~SiPMDetectorConstruction()
|
||||||
{ }
|
{
|
||||||
|
}
|
||||||
|
|
||||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||||
|
|
||||||
|
|
@ -28,229 +31,329 @@ G4VPhysicalVolume* SiPMDetectorConstruction::Construct()
|
||||||
//Get the parameters instance
|
//Get the parameters instance
|
||||||
SiPMParameters& parameters = SiPMParameters::GetInstance();
|
SiPMParameters& parameters = SiPMParameters::GetInstance();
|
||||||
|
|
||||||
|
|
||||||
// Option to switch on/off checking of volumes overlaps
|
// Option to switch on/off checking of volumes overlaps
|
||||||
G4bool checkOverlaps = true;
|
G4bool checkOverlaps = true;
|
||||||
|
|
||||||
|
//---Object size calculations-----------------------------------------------------------------------------------
|
||||||
|
//Calculate everything with real lengths
|
||||||
|
double lengthMultiplier = parameters.GetLengthMultiplier();
|
||||||
|
|
||||||
// ------------- Materials -------------
|
G4ThreeVector sipm_size = parameters.GetSiPMSize();
|
||||||
|
sipm_size.setX(sipm_size.getX() * lengthMultiplier);
|
||||||
|
sipm_size.setY(sipm_size.getY() * lengthMultiplier);
|
||||||
|
sipm_size.setZ(sipm_size.getZ() * lengthMultiplier);
|
||||||
|
|
||||||
|
G4ThreeVector scintillator_size = parameters.GetScintillatorSize();
|
||||||
|
scintillator_size.setX(scintillator_size.getX() * lengthMultiplier);
|
||||||
|
scintillator_size.setY(scintillator_size.getY() * lengthMultiplier);
|
||||||
|
scintillator_size.setZ(scintillator_size.getZ() * lengthMultiplier);
|
||||||
|
|
||||||
|
//Scintillator radius | only used if the shape of the scintillator is set to tube
|
||||||
|
G4double scint_radius = parameters.GetScintillatorRadius() * lengthMultiplier;
|
||||||
|
|
||||||
|
G4double coatingThickness = parameters.CoatingThickness() * lengthMultiplier;
|
||||||
|
|
||||||
|
//Scintillator size with wolfram
|
||||||
|
G4ThreeVector coated_scintillator_size = scintillator_size; //scintillator size already calculated with the length mulitiplier
|
||||||
|
coated_scintillator_size.setX(coated_scintillator_size.getX() + (coatingThickness * 2));
|
||||||
|
coated_scintillator_size.setY(coated_scintillator_size.getY() + (coatingThickness * 2));
|
||||||
|
coated_scintillator_size.setZ(coated_scintillator_size.getZ() + (coatingThickness * 2)); //both sides
|
||||||
|
|
||||||
|
//World size
|
||||||
|
int sipm_size_multiplier = 0;
|
||||||
|
if(parameters.FirstSiPMEnabled() || parameters.SecondSiPMEnabled()) sipm_size_multiplier = 1; //if at least one sipm is enabled, then increase the world size by sipm size * 1
|
||||||
|
else if (parameters.FirstSiPMEnabled() && parameters.SecondSiPMEnabled()) sipm_size_multiplier = 2; //if both sipm is enabled, then increase the world size by sipm size * 2
|
||||||
|
|
||||||
|
G4double world_sizeZ = 0;
|
||||||
|
if (coatingThickness > sipm_size.getZ()) //if wolfram thicker than sipm, then increase the worldZ by the wolfram thickness
|
||||||
|
{
|
||||||
|
world_sizeZ = coated_scintillator_size.getZ();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
world_sizeZ = sipm_size_multiplier * sipm_size.getZ() + scintillator_size.getZ();
|
||||||
|
}
|
||||||
|
|
||||||
|
G4double world_sizeX = parameters.GetXDivison() * coated_scintillator_size.getX();
|
||||||
|
G4double world_sizeY = parameters.GetYDivison() * coated_scintillator_size.getY();
|
||||||
|
|
||||||
|
//Container sizes
|
||||||
|
G4double container_sizeX = coated_scintillator_size.getX();
|
||||||
|
G4double container_sizeY = coated_scintillator_size.getY();
|
||||||
|
G4double container_sizeZ = world_sizeZ;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
//---Object position calculations-----------------------------------------------------------------------------------
|
||||||
|
G4ThreeVector pos_sipm0 = G4ThreeVector();
|
||||||
|
G4ThreeVector pos_sipm1 = G4ThreeVector();
|
||||||
|
G4ThreeVector posScint = G4ThreeVector();
|
||||||
|
G4ThreeVector posScintCoating = G4ThreeVector();
|
||||||
|
double z_pos_helper = 0;
|
||||||
|
|
||||||
|
//World position
|
||||||
|
G4ThreeVector posWorld = G4ThreeVector(); //at (0, 0, 0)
|
||||||
|
|
||||||
|
//SiPM0 position
|
||||||
|
if (parameters.FirstSiPMEnabled())
|
||||||
|
{
|
||||||
|
if (coatingThickness > sipm_size.getZ())
|
||||||
|
{
|
||||||
|
z_pos_helper = coatingThickness - (sipm_size.getZ() / 2);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
z_pos_helper = sipm_size.getZ() / 2;
|
||||||
|
}
|
||||||
|
z_pos_helper = z_pos_helper - (container_sizeZ / 2);
|
||||||
|
pos_sipm0 = G4ThreeVector(0, 0, z_pos_helper); //center on X and Y
|
||||||
|
}
|
||||||
|
|
||||||
|
//SiPM1 position
|
||||||
|
if (parameters.SecondSiPMEnabled())
|
||||||
|
{
|
||||||
|
if (coatingThickness > sipm_size.getZ())
|
||||||
|
{
|
||||||
|
z_pos_helper = coatingThickness + scintillator_size.getZ() + (sipm_size.getZ() / 2);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
z_pos_helper = sipm_size.getZ() + scintillator_size.getZ() + sipm_size.getZ() / 2;
|
||||||
|
}
|
||||||
|
z_pos_helper = z_pos_helper - (container_sizeZ / 2);
|
||||||
|
pos_sipm1 = G4ThreeVector(0, 0, z_pos_helper); //center on X and Y
|
||||||
|
}
|
||||||
|
|
||||||
|
//Coating position
|
||||||
|
if (parameters.FirstSiPMEnabled())
|
||||||
|
{
|
||||||
|
if (coatingThickness > sipm_size.getZ())
|
||||||
|
{
|
||||||
|
z_pos_helper = coated_scintillator_size.getZ() / 2;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
z_pos_helper = sipm_size.getZ() - coatingThickness + (coated_scintillator_size.getZ() / 2);
|
||||||
|
}
|
||||||
|
z_pos_helper = z_pos_helper - (container_sizeZ / 2);
|
||||||
|
posScintCoating = G4ThreeVector(0, 0, z_pos_helper); //center on X and Y
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
z_pos_helper = coated_scintillator_size.getZ() / 2;
|
||||||
|
z_pos_helper = z_pos_helper - (container_sizeZ / 2);
|
||||||
|
posScintCoating = G4ThreeVector(0, 0, z_pos_helper); //center on X and Y
|
||||||
|
}
|
||||||
|
|
||||||
|
//Scintillator position
|
||||||
|
if (parameters.FirstSiPMEnabled())
|
||||||
|
{
|
||||||
|
if (coatingThickness > sipm_size.getZ())
|
||||||
|
{
|
||||||
|
z_pos_helper = coatingThickness + (scintillator_size.getZ() / 2);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
z_pos_helper = sipm_size.getZ() + (scintillator_size.getZ() / 2);
|
||||||
|
}
|
||||||
|
z_pos_helper = z_pos_helper - (container_sizeZ / 2);
|
||||||
|
posScint = G4ThreeVector(0, 0, z_pos_helper); //center on X and Y
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
z_pos_helper = coatingThickness + (scintillator_size.getZ() / 2);
|
||||||
|
z_pos_helper = z_pos_helper - (container_sizeZ / 2);
|
||||||
|
//posScint = G4ThreeVector(0, 0, z_pos_helper); //center on X and Y
|
||||||
|
}
|
||||||
|
|
||||||
|
//------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
//---Material definitions-------------------------------------------------------------------------------------------
|
||||||
G4double a, z, density;
|
G4double a, z, density;
|
||||||
G4int nelements;
|
G4int nelements;
|
||||||
|
|
||||||
// Air
|
// Air
|
||||||
//
|
G4Element* N = new G4Element("Nitrogen", "N", z = 7, a = 14.01 * g / mole);
|
||||||
G4Element* N = new G4Element("Nitrogen", "N", z=7 , a=14.01*g/mole);
|
G4Element* O = new G4Element("Oxygen", "O", z = 8, a = 16.00 * g / mole);
|
||||||
G4Element* O = new G4Element("Oxygen" , "O", z=8 , a=16.00*g/mole);
|
G4Material* air = new G4Material("Air", density = 1.29 * mg / cm3, nelements = 2);
|
||||||
|
air->AddElement(N, 70. * perCent);
|
||||||
|
air->AddElement(O, 30. * perCent);
|
||||||
|
|
||||||
G4Material* air = new G4Material("Air", density=1.29*mg/cm3, nelements=2);
|
//Water
|
||||||
air->AddElement(N, 70.*perCent);
|
G4Element* H = new G4Element("Hydrogen", "H", z = 1, a = 1.01 * g / mole);
|
||||||
air->AddElement(O, 30.*perCent);
|
G4Material* water = new G4Material("Water", density = 1.0 * g / cm3, nelements = 2);
|
||||||
|
|
||||||
// Water
|
|
||||||
//
|
|
||||||
G4Element* H = new G4Element("Hydrogen", "H", z=1 , a=1.01*g/mole);
|
|
||||||
|
|
||||||
G4Material* water = new G4Material("Water", density= 1.0*g/cm3, nelements=2);
|
|
||||||
water->AddElement(H, 2);
|
water->AddElement(H, 2);
|
||||||
water->AddElement(O, 1);
|
water->AddElement(O, 1);
|
||||||
|
|
||||||
/*
|
G4Material* wolfram = nist->FindOrBuildMaterial("G4_W");
|
||||||
* Wolfram material
|
|
||||||
*/
|
|
||||||
G4Material *wolfram = nist -> FindOrBuildMaterial("G4_W");
|
|
||||||
|
|
||||||
|
//Object materials
|
||||||
|
G4Material* world_mat = air; //nist->FindOrBuildMaterial("G4_AIR");
|
||||||
|
G4Material* scint_mat = water; //nist->FindOrBuildMaterial("G4_Si");
|
||||||
|
G4Material* scint_coating = wolfram; //nist->FindOrBuildMaterial("G4_W");
|
||||||
|
G4Material* sipm0_mat = air; //nist->FindOrBuildMaterial("G4_Si");
|
||||||
|
G4Material* sipm1_mat = air; //nist->FindOrBuildMaterial("G4_Si");
|
||||||
|
//------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
//
|
//---World definitions----------------------------------------------------------------------------------------------
|
||||||
// World
|
G4Box* solidWorld = new G4Box( "World", //its name
|
||||||
//
|
world_sizeX,
|
||||||
G4ThreeVector sipm_size = parameters.GetSiPMSize();
|
world_sizeY,
|
||||||
|
world_sizeZ); //its size
|
||||||
|
//Prevent overlapping so the world size is doubled
|
||||||
|
|
||||||
G4double world_sizeX = parameters.GetXDivison() * sipm_size.getX() * cm; //2*m;
|
G4LogicalVolume* logicWorld = new G4LogicalVolume( solidWorld, //its solid
|
||||||
G4double world_sizeY = parameters.GetYDivison() * sipm_size.getY() * cm; //2*m;
|
world_mat, //its material
|
||||||
G4double world_sizeZ = 2*sipm_size.getZ() + parameters.GetScintillatorLength();
|
"World"); //its name
|
||||||
G4Material* world_mat = air; //nist->FindOrBuildMaterial("G4_AIR");
|
|
||||||
|
|
||||||
G4Box* solidWorld =
|
G4VPhysicalVolume* physWorld = new G4PVPlacement( 0, //no rotation
|
||||||
new G4Box("World", //its name
|
posWorld, //at (0,0,0)
|
||||||
/*0.5**/world_sizeX, /*0.5**/world_sizeY, /*0.5**/world_sizeZ); //its size
|
logicWorld, //its logical volume
|
||||||
|
"World", //its name
|
||||||
|
0, //its mother volume
|
||||||
|
false, //no boolean operation
|
||||||
|
0, //copy lxenumber
|
||||||
|
checkOverlaps); //overlaps checking
|
||||||
|
//------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
G4LogicalVolume* logicWorld =
|
//---Container definitions------------------------------------------------------------------------------------------
|
||||||
new G4LogicalVolume(solidWorld, //its solid
|
//Place a container which contains everything (sipms, scintillator, coating) for G4PVPlacement
|
||||||
world_mat, //its material
|
G4Box *solidContainer = new G4Box( "Container", //name
|
||||||
"World"); //its name
|
container_sizeX * 0.5,
|
||||||
|
container_sizeY * 0.5,
|
||||||
|
container_sizeZ * 0.5); //size
|
||||||
|
|
||||||
G4VPhysicalVolume* physWorld =
|
G4LogicalVolume *logicContainer = new G4LogicalVolume( solidContainer, //its solid
|
||||||
new G4PVPlacement(0, //no rotation
|
world_mat, //its material
|
||||||
G4ThreeVector(), //at (0,0,0)
|
"Container"); //its name
|
||||||
logicWorld, //its logical volume
|
|
||||||
"World", //its name
|
|
||||||
0, //its mother volume
|
|
||||||
false, //no boolean operation
|
|
||||||
0, //copy lxenumber
|
|
||||||
checkOverlaps); //overlaps checking
|
|
||||||
|
|
||||||
//Place a container which contains everything for G4Replica
|
|
||||||
G4double container_sizeX = sipm_size.getX()*cm;
|
|
||||||
G4double container_sizeY = sipm_size.getY()*cm;
|
|
||||||
G4double container_sizeZ = (sipm_size.getZ()*2 + parameters.GetScintillatorLength())*cm;
|
|
||||||
|
|
||||||
G4Box *solidContainer =
|
|
||||||
new G4Box("Container", container_sizeX*0.5, container_sizeY*0.5, container_sizeZ*0.5);
|
|
||||||
|
|
||||||
G4LogicalVolume *logicContainer =
|
|
||||||
new G4LogicalVolume(solidContainer, world_mat, "Container");
|
|
||||||
|
|
||||||
G4Colour containerColour( 1.0, 1.0, 0.0);
|
G4Colour containerColour( 1.0, 1.0, 0.0);
|
||||||
G4VisAttributes* containerVisAtt = new G4VisAttributes( containerColour );
|
G4VisAttributes* containerVisAtt = new G4VisAttributes( containerColour );
|
||||||
//logicContainer -> SetVisAttributes(containerVisAtt);
|
logicContainer -> SetVisAttributes(containerVisAtt);
|
||||||
|
logicContainer -> SetVisAttributes(G4VisAttributes::GetInvisible());
|
||||||
|
//------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
G4double sizeX = sipm_size.getX()*cm;
|
//---Scintillator coating definitions-------------------------------------------------------------------------------
|
||||||
G4double sizeY = sipm_size.getY()*cm;
|
G4Box* solidScintCoating = new G4Box( "ScintillatorCoating", //its name
|
||||||
G4double sipm_width = sipm_size.getZ()*cm;
|
0.5 * coated_scintillator_size.getX(),
|
||||||
|
0.5 * coated_scintillator_size.getY(),
|
||||||
//
|
0.5 * coated_scintillator_size.getZ()); //its size
|
||||||
// Sipm0
|
|
||||||
//
|
|
||||||
G4Material* sipm0_mat = air; //nist->FindOrBuildMaterial("G4_Si");
|
|
||||||
|
|
||||||
// sipm0 shape
|
|
||||||
G4double sipm0_sizeX = sizeX;
|
|
||||||
G4double sipm0_sizeY = sizeY;
|
|
||||||
G4double sipm0_sizeZ = sipm_width;
|
|
||||||
|
|
||||||
G4ThreeVector pos_sipm0 = G4ThreeVector(0, 0*cm, (sipm_width/2)-container_sizeZ*0.5);
|
|
||||||
|
|
||||||
G4Box* solidSipm0 =
|
|
||||||
new G4Box("Sipm0", //its name
|
|
||||||
0.5*sipm0_sizeX, 0.5*sipm0_sizeY,
|
|
||||||
0.5*sipm0_sizeZ); //its size
|
|
||||||
|
|
||||||
G4LogicalVolume* logicSipm0 =
|
|
||||||
new G4LogicalVolume(solidSipm0, //its solid
|
|
||||||
sipm0_mat, //its material
|
|
||||||
"Sipm0"); //its name
|
|
||||||
|
|
||||||
G4VPhysicalVolume *physSipm0 =
|
|
||||||
new G4PVPlacement(0, //no rotation
|
|
||||||
pos_sipm0, //at position
|
|
||||||
logicSipm0, //its logical volume
|
|
||||||
"Sipm0", //its name
|
|
||||||
logicContainer, //its mother volume
|
|
||||||
false, //no boolean operation
|
|
||||||
0, //copy lxenumber
|
|
||||||
checkOverlaps); //overlaps checking
|
|
||||||
|
|
||||||
G4Colour sipmColour( 0.0, 1.0, 0.0);
|
|
||||||
G4VisAttributes* sipmVisAtt = new G4VisAttributes( sipmColour );
|
|
||||||
logicSipm0->SetVisAttributes(sipmVisAtt);
|
|
||||||
|
|
||||||
|
|
||||||
//
|
//---Scintillator definitions---------------------------------------------------------------------------------------
|
||||||
// Box
|
|
||||||
// Changed the scintillator construction so now the box is Wolfram whic contains the scintillator
|
|
||||||
//
|
|
||||||
//
|
|
||||||
G4Material* scint_mat = water; //nist->FindOrBuildMaterial("G4_Si");
|
|
||||||
|
|
||||||
// box shape
|
G4Box* solidScint = new G4Box( "Scintillator", //its name
|
||||||
G4double scint_sizeX = sizeX;
|
0.5 * scintillator_size.getX(),
|
||||||
G4double scint_sizeY = sizeY;
|
0.5 * scintillator_size.getY(),
|
||||||
G4double scint_sizeZ = parameters.GetScintillatorLength() * cm;
|
0.5 * scintillator_size.getZ()); //its size
|
||||||
|
|
||||||
G4double z_pos = sipm_width + (scint_sizeZ*0.5);
|
G4LogicalVolume* logicScint = new G4LogicalVolume( solidScint, //its solid
|
||||||
|
scint_mat, //its material
|
||||||
|
"Scintillator"); //its name
|
||||||
|
|
||||||
G4ThreeVector posScint = G4ThreeVector(0, 0*cm, z_pos-container_sizeZ*0.5);
|
G4VSolid* solidCoating = new G4SubtractionSolid("ScintillatorCoating",
|
||||||
|
solidScintCoating,
|
||||||
|
solidScint/*,
|
||||||
|
0,
|
||||||
|
G4ThreeVector(0, 0, 0)*/);
|
||||||
|
|
||||||
G4Box* solidScint_W =
|
G4LogicalVolume* logicScintCoating = new G4LogicalVolume( solidCoating, //its solid
|
||||||
new G4Box("Scintillator_W", //its name
|
scint_coating, //its material
|
||||||
0.5*scint_sizeX, 0.5*scint_sizeY,
|
"ScintillatorCoating"); //its name
|
||||||
0.5*scint_sizeZ); //its size
|
|
||||||
|
|
||||||
G4LogicalVolume* logicScint_W =
|
G4VPhysicalVolume* physScint = new G4PVPlacement( 0, //no rotation
|
||||||
new G4LogicalVolume(solidScint_W, //its solid
|
posScint, //at position
|
||||||
wolfram, //its material
|
logicScint, //its logical volume
|
||||||
"Scintillator_W"); //its name
|
"Scintillator", //its name
|
||||||
|
logicContainer, //its mother volume
|
||||||
|
false, //no boolean operation
|
||||||
|
0, //copy lxenumber
|
||||||
|
checkOverlaps); //overlaps checking
|
||||||
|
|
||||||
G4VPhysicalVolume *physScint_W =
|
G4VPhysicalVolume* physScintCoating = new G4PVPlacement(0, //no rotation
|
||||||
new G4PVPlacement(0, //no rotation
|
posScintCoating, //at position
|
||||||
posScint, //at position
|
logicScintCoating, //its logical volume
|
||||||
logicScint_W, //its logical volume
|
"ScintillatorCoating", //its name
|
||||||
"Scintillator_W", //its name
|
logicContainer, //its mother volume
|
||||||
logicContainer, //its mother volume
|
false, //no boolean operation
|
||||||
false, //no boolean operation
|
0, //copy lxenumber
|
||||||
0, //copy lxenumber
|
checkOverlaps); //overlaps checking
|
||||||
checkOverlaps); //overlaps checking
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Scintillator
|
|
||||||
*/
|
|
||||||
|
|
||||||
G4double scint_radius = parameters.GetScintillatorRadius()*cm;
|
G4Colour scintColour(1.0, 0, 0.0);
|
||||||
|
G4VisAttributes* scintVisAtt = new G4VisAttributes(scintColour);
|
||||||
|
logicScint->SetVisAttributes(scintVisAtt);
|
||||||
|
//------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
G4Tubs * solidScint = new G4Tubs("tube", 0, scint_radius, 0.5*(scint_sizeZ+(0.5*mm)), 0, 2*CLHEP::pi); //name, inner R, outter R, Half length in Z, starting angle, angle of the segment in rad
|
//---SiPM0 definitions----------------------------------------------------------------------------------------------
|
||||||
new G4Box("Scintillator",
|
G4Colour sipmColour(0.0, 1.0, 0.0);
|
||||||
0.5*scint_sizeX,
|
G4Box* solidSipm0;
|
||||||
0.5*scint_sizeY,
|
G4LogicalVolume* logicSipm0;
|
||||||
0.5*scint_sizeZ);
|
G4VPhysicalVolume* physSipm0;
|
||||||
|
G4VisAttributes* sipmVisAtt;
|
||||||
|
|
||||||
G4LogicalVolume *logicScint =
|
if (parameters.FirstSiPMEnabled())
|
||||||
new G4LogicalVolume(solidScint, //its solid
|
{
|
||||||
scint_mat, //its material
|
solidSipm0 = new G4Box( "Sipm0", //its name
|
||||||
"Scintillator"); //its name
|
0.5 * sipm_size.getX(),
|
||||||
|
0.5 * sipm_size.getY(),
|
||||||
|
0.5 * sipm_size.getZ()); //its size
|
||||||
|
|
||||||
G4VPhysicalVolume *physScint =
|
logicSipm0 = new G4LogicalVolume( solidSipm0, //its solid
|
||||||
new G4PVPlacement(0, //no rotation
|
sipm0_mat, //its material
|
||||||
G4ThreeVector(0,0,0), //at position (as the mother volume is not the world, maybe this will be the right place)
|
"Sipm0"); //its name
|
||||||
logicScint, //its logical volume
|
|
||||||
"Scintillator", //its name
|
|
||||||
logicScint_W, //its mother volume
|
|
||||||
false, //no boolean operation
|
|
||||||
0, //copy lxenumber
|
|
||||||
checkOverlaps); //overlaps checking
|
|
||||||
|
|
||||||
G4Colour scintColour( 1.0, 0, 0.0);
|
physSipm0 = new G4PVPlacement( 0, //no rotation
|
||||||
G4VisAttributes* scintVisAtt = new G4VisAttributes( scintColour );
|
pos_sipm0, //at position
|
||||||
logicScint -> SetVisAttributes(scintVisAtt);
|
logicSipm0, //its logical volume
|
||||||
|
"Sipm0", //its name
|
||||||
//
|
logicContainer, //its mother volume
|
||||||
// Sipm1
|
false, //no boolean operation
|
||||||
//
|
0, //copy lxenumber
|
||||||
|
checkOverlaps); //overlaps checking
|
||||||
G4double sipm2_pos_z = (0.5*sipm_width) + scint_sizeZ;
|
sipmVisAtt = new G4VisAttributes(sipmColour);
|
||||||
|
logicSipm0->SetVisAttributes(sipmVisAtt);
|
||||||
G4Material* sipm1_mat = air; //nist->FindOrBuildMaterial("G4_Si");
|
}
|
||||||
G4ThreeVector pos_sipm1 = G4ThreeVector(0, 0*cm, sipm_width+sipm2_pos_z-container_sizeZ*0.5);
|
//------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
//---SiPM1 definitions----------------------------------------------------------------------------------------------
|
||||||
// sipm1 shape -> same as sipm0
|
// sipm1 shape -> same as sipm0
|
||||||
G4Box* solidSipm1 =
|
G4Box* solidSipm1;
|
||||||
new G4Box("Sipm1", //its name
|
G4LogicalVolume* logicSipm1;
|
||||||
0.5*sipm0_sizeX, 0.5*sipm0_sizeY,
|
G4VPhysicalVolume* physSipm1;
|
||||||
0.5*sipm0_sizeZ); //its size
|
|
||||||
|
|
||||||
G4LogicalVolume* logicSipm1 =
|
if (parameters.SecondSiPMEnabled())
|
||||||
new G4LogicalVolume(solidSipm1, //its solid
|
{
|
||||||
sipm1_mat, //its material
|
solidSipm1 = new G4Box( "Sipm1", //its name
|
||||||
"Sipm1"); //its name
|
0.5 * sipm_size.getX(),
|
||||||
|
0.5 * sipm_size.getY(),
|
||||||
|
0.5 * sipm_size.getZ()); //its size
|
||||||
|
|
||||||
G4VPhysicalVolume *physSipm1 =
|
logicSipm1 = new G4LogicalVolume( solidSipm1, //its solid
|
||||||
new G4PVPlacement(0, //no rotation
|
sipm1_mat, //its material
|
||||||
pos_sipm1, //at position
|
"Sipm1"); //its name
|
||||||
logicSipm1, //its logical volume
|
|
||||||
"Sipm1", //its name
|
|
||||||
logicContainer, //its mother volume
|
|
||||||
false, //no boolean operation
|
|
||||||
0, //copy lxenumber
|
|
||||||
checkOverlaps); //overlaps checking
|
|
||||||
|
|
||||||
logicSipm1->SetVisAttributes(sipmVisAtt);
|
physSipm1 = new G4PVPlacement( 0, //no rotation
|
||||||
|
pos_sipm1, //at position
|
||||||
|
logicSipm1, //its logical volume
|
||||||
|
"Sipm1", //its name
|
||||||
|
logicContainer, //its mother volume
|
||||||
|
false, //no boolean operation
|
||||||
|
0, //copy lxenumber
|
||||||
|
checkOverlaps); //overlaps checking
|
||||||
|
|
||||||
//----------------------------------General values--------------------------------------------------------
|
logicSipm1->SetVisAttributes(sipmVisAtt);
|
||||||
|
}
|
||||||
|
//------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
//---General values-------------------------------------------------------------------------------------------------
|
||||||
const G4int n = 2;
|
const G4int n = 2;
|
||||||
G4double pp[n] = {2.0*eV, 3.0*eV}; //distribution of optical photons produced in eV
|
G4double pp[n] = {2.0 * eV, 3.0 * eV}; //distribution of optical photons produced in eV
|
||||||
|
//------------------------------------------------------------------------------------------------------------------
|
||||||
//---------------------------------General Material Settings----------------------------------------------
|
|
||||||
|
|
||||||
|
//---General Material Settings--------------------------------------------------------------------------------------
|
||||||
//material of scintillator
|
//material of scintillator
|
||||||
G4double rind_scintillator[n] = {1.59, 1.57}; //refraction index
|
G4double rind_scintillator[n] = {1.59, 1.57}; //refraction index
|
||||||
G4double absl[n] = {35.*m, 35.*m}; //absorption length
|
G4double absl[n] = {35.*m, 35.*m}; //absorption length
|
||||||
|
|
@ -263,7 +366,7 @@ G4VPhysicalVolume* SiPMDetectorConstruction::Construct()
|
||||||
scint_material_mpt -> AddProperty("ABSLENGTH", pp, absl, n);
|
scint_material_mpt -> AddProperty("ABSLENGTH", pp, absl, n);
|
||||||
scint_material_mpt -> AddProperty("SLOWCOMPONENT", pp, slow, n);
|
scint_material_mpt -> AddProperty("SLOWCOMPONENT", pp, slow, n);
|
||||||
scint_material_mpt -> AddProperty("FASTCOMPONENT", pp, fast, n);
|
scint_material_mpt -> AddProperty("FASTCOMPONENT", pp, fast, n);
|
||||||
scint_material_mpt -> AddConstProperty("SCINTILLATIONYIELD", 50./MeV); //50 volt
|
scint_material_mpt -> AddConstProperty("SCINTILLATIONYIELD", 1000./MeV); //50 volt
|
||||||
scint_material_mpt -> AddConstProperty("RESOLUTIONSCALE", 1.0);
|
scint_material_mpt -> AddConstProperty("RESOLUTIONSCALE", 1.0);
|
||||||
scint_material_mpt -> AddConstProperty("FASTTIMECONSTANT", 0.01*ns);
|
scint_material_mpt -> AddConstProperty("FASTTIMECONSTANT", 0.01*ns);
|
||||||
scint_material_mpt -> AddConstProperty("SLOWTIMECONSTANT", 1.*ns);
|
scint_material_mpt -> AddConstProperty("SLOWTIMECONSTANT", 1.*ns);
|
||||||
|
|
@ -274,14 +377,14 @@ G4VPhysicalVolume* SiPMDetectorConstruction::Construct()
|
||||||
//Surface of scintillator to wolfram
|
//Surface of scintillator to wolfram
|
||||||
G4OpticalSurface *OpScintillatorSurface = new G4OpticalSurface("Scintillator Surface to Wolfram",glisur, polished, dielectric_metal);
|
G4OpticalSurface *OpScintillatorSurface = new G4OpticalSurface("Scintillator Surface to Wolfram",glisur, polished, dielectric_metal);
|
||||||
|
|
||||||
G4LogicalBorderSurface *ScintillatorSurface = new G4LogicalBorderSurface("Scintillator Surface", physScint, physScint_W, OpScintillatorSurface);
|
G4LogicalBorderSurface *ScintillatorSurface = new G4LogicalBorderSurface("Scintillator Surface", physScint, physScintCoating, OpScintillatorSurface);
|
||||||
|
|
||||||
G4double reflectivity_W[n] = {0.9, 0.9};
|
G4double reflectivityCoating[n] = {0.99, 0.99};
|
||||||
G4double efficiency_W[n] = {0, 0};
|
G4double efficiencyCoating[n] = {0, 0};
|
||||||
|
|
||||||
G4MaterialPropertiesTable *ScintillatorToWolframMaterialPropertyTable = new G4MaterialPropertiesTable();
|
G4MaterialPropertiesTable *ScintillatorToWolframMaterialPropertyTable = new G4MaterialPropertiesTable();
|
||||||
ScintillatorToWolframMaterialPropertyTable -> AddProperty("REFLECTIVITY", pp, reflectivity_W, n);
|
ScintillatorToWolframMaterialPropertyTable -> AddProperty("REFLECTIVITY", pp, reflectivityCoating, n);
|
||||||
ScintillatorToWolframMaterialPropertyTable -> AddProperty("EFFICIENCY", pp, efficiency_W, n);
|
ScintillatorToWolframMaterialPropertyTable -> AddProperty("EFFICIENCY", pp, efficiencyCoating, n);
|
||||||
|
|
||||||
OpScintillatorSurface -> SetMaterialPropertiesTable(ScintillatorToWolframMaterialPropertyTable);
|
OpScintillatorSurface -> SetMaterialPropertiesTable(ScintillatorToWolframMaterialPropertyTable);
|
||||||
|
|
||||||
|
|
@ -289,12 +392,19 @@ G4VPhysicalVolume* SiPMDetectorConstruction::Construct()
|
||||||
//Surface from scintillator to sipm0 and sipm1
|
//Surface from scintillator to sipm0 and sipm1
|
||||||
G4OpticalSurface *SurfacefromScintillatorToSipm = new G4OpticalSurface("SurfacefromScintillatorToSipm", glisur, polished, dielectric_metal);
|
G4OpticalSurface *SurfacefromScintillatorToSipm = new G4OpticalSurface("SurfacefromScintillatorToSipm", glisur, polished, dielectric_metal);
|
||||||
|
|
||||||
G4LogicalBorderSurface *SurfacefromScintillatorToSipm0_logical = new G4LogicalBorderSurface("SurfacefromScintillatorToSipm0", physScint, physSipm0, SurfacefromScintillatorToSipm);
|
G4LogicalBorderSurface* SurfacefromScintillatorToSipm0_logical;
|
||||||
|
G4LogicalBorderSurface* SurfacefromScintillatorToSipm1_logical;
|
||||||
|
|
||||||
G4LogicalBorderSurface *SurfacefromScintillatorToSipm1_logical2 = new G4LogicalBorderSurface("SurfacefromScintillatorToSipm1", physScint, physSipm1, SurfacefromScintillatorToSipm);
|
if (parameters.FirstSiPMEnabled())
|
||||||
|
{
|
||||||
|
SurfacefromScintillatorToSipm0_logical = new G4LogicalBorderSurface("SurfacefromScintillatorToSipm0", physScint, physSipm0, SurfacefromScintillatorToSipm);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (parameters.SecondSiPMEnabled())
|
||||||
|
{
|
||||||
|
SurfacefromScintillatorToSipm1_logical = new G4LogicalBorderSurface("SurfacefromScintillatorToSipm1", physScint, physSipm1, SurfacefromScintillatorToSipm);
|
||||||
|
}
|
||||||
|
|
||||||
//----------------------------------
|
|
||||||
G4double reflectivity[n] = {1, 1}; //ha nem 1,1 akkor nem éri el a sipm-et az aki eléri a scint végét.
|
G4double reflectivity[n] = {1, 1}; //ha nem 1,1 akkor nem éri el a sipm-et az aki eléri a scint végét.
|
||||||
|
|
||||||
G4MaterialPropertiesTable *ScintillatorMaterialPropertyTable = new G4MaterialPropertiesTable();
|
G4MaterialPropertiesTable *ScintillatorMaterialPropertyTable = new G4MaterialPropertiesTable();
|
||||||
|
|
@ -302,11 +412,14 @@ G4VPhysicalVolume* SiPMDetectorConstruction::Construct()
|
||||||
|
|
||||||
SurfacefromScintillatorToSipm -> SetMaterialPropertiesTable(ScintillatorMaterialPropertyTable);
|
SurfacefromScintillatorToSipm -> SetMaterialPropertiesTable(ScintillatorMaterialPropertyTable);
|
||||||
|
|
||||||
|
//------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
//---Container placement--------------------------------------------------------------------------------------------
|
||||||
//Using G4PVPlacement instead of replica or others
|
//Using G4PVPlacement instead of replica or others
|
||||||
|
|
||||||
int x = parameters.GetXDivison();
|
int x = parameters.GetXDivison();
|
||||||
int y = parameters.GetYDivison();
|
int y = parameters.GetYDivison();
|
||||||
int helper = 0;
|
int copyNumber = 0;
|
||||||
G4VPhysicalVolume *physContainer[x][y];
|
G4VPhysicalVolume *physContainer[x][y];
|
||||||
char s1[30];
|
char s1[30];
|
||||||
|
|
||||||
|
|
@ -316,17 +429,17 @@ G4VPhysicalVolume* SiPMDetectorConstruction::Construct()
|
||||||
{
|
{
|
||||||
snprintf(s1, 30, "Container_x%d_y%d", i, j);
|
snprintf(s1, 30, "Container_x%d_y%d", i, j);
|
||||||
logicContainer -> SetName(s1);
|
logicContainer -> SetName(s1);
|
||||||
physContainer[x][y] = new G4PVPlacement(0,
|
physContainer[i][j] = new G4PVPlacement( 0,
|
||||||
G4ThreeVector(i*container_sizeX, j*container_sizeY, 0),
|
G4ThreeVector(i * container_sizeX + (container_sizeX / 2) - (world_sizeX / 2), j * container_sizeY + (container_sizeY / 2) - (world_sizeY / 2), container_sizeZ / 2),
|
||||||
logicContainer,
|
logicContainer,
|
||||||
s1, //its name
|
s1, //its name
|
||||||
logicWorld,
|
logicWorld,
|
||||||
false,
|
false,
|
||||||
helper, //copy number
|
copyNumber, //copy number
|
||||||
checkOverlaps);
|
checkOverlaps);
|
||||||
helper++;
|
copyNumber++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
//------------------------------------------------------------------------------------------------------------------
|
||||||
return physWorld;
|
return physWorld;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue