divaldo
/
SiPM
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: divaldo:d73a51b18523a0176c3bd086b3facdb0052868eb
Branches Tags
divaldo:master
divaldo:space
divaldo:HEAD
..
compare: divaldo:cd7e4d34bd6275cf92d24fc9926a3e0ad104e137
Branches Tags
divaldo:space
divaldo:HEAD
divaldo:master

1 Commits
d73a51b185 ... cd7e4d34bd

Author SHA1 Message Date
David Baranyai cd7e4d34bd Construction changes and minor modifications 2020-04-08 20:28:29 +02:00
4 changed files with 10 additions and 55 deletions
Show Stats Expand all files Collapse all files

5
README.md
View File

@ -59,13 +59,12 @@ Run with custom config file
* secondsipmenabled - Enable the second SiPM
# Changelog
<<<<<<< HEAD
## 2020-04-08
* SiPM position fix
* Changed scintillator mother volume
* Changed displayLimit in vis.mac
* New default config file
=======
>>>>>>> 247f4aad085b756a9fdbb30ec68ccec1ad1b97b7
## 2020-02-19
* Scintillator subtracted from it's coating
* Scintillation process fix

14
config.conf
View File

@ -1,22 +1,22 @@
pgpositionx=0
pgpositiony=-15
pgpositionz=10
pgpositiony=-10
pgpositionz=11
pgmomentumx=0
pgmomentumy=1
pgmomentumz=0
sipmsizex=1
sipmsizey=1
sipmsizez=1
scintillatorsizex=1
scintillatorsizey=1
scintillatorsizex=2
scintillatorsizey=2
scintillatorlength=20
scintillatorisbox=1
coatingthickness=0.1
scintillatorradius=5
xdivision=1
ydivision=1
pgenergy=100
numberofevents=100
ydivision=5
pgenergy=1000
numberofevents=1
lengthunit=cm
firstsipmenabled=1
secondsipmenabled=0

2
macros/vis.mac
View File

@ -17,6 +17,6 @@
/vis/scene/add/eventID
/vis/scene/add/text 0 6 14 cm 18 4 4 Box
/vis/ogl/set/displayListLimit 50000
/vis/ogl/set/displayListLimit 500000
/run/beamOn 10

44
src/SiPMDetectorConstruction.cc
View File

@ -165,11 +165,7 @@ G4VPhysicalVolume* SiPMDetectorConstruction::Construct()
{
z_pos_helper = coatingThickness + (scintillator_size.getZ() / 2);
z_pos_helper = z_pos_helper - (container_sizeZ / 2);
<<<<<<< HEAD
//posScint = G4ThreeVector(0, 0, z_pos_helper); //center on X and Y
=======
posScint = G4ThreeVector(0, 0, z_pos_helper); //center on X and Y
>>>>>>> 247f4aad085b756a9fdbb30ec68ccec1ad1b97b7
}
//------------------------------------------------------------------------------------------------------------------
@ -203,16 +199,10 @@ G4VPhysicalVolume* SiPMDetectorConstruction::Construct()
//---World definitions----------------------------------------------------------------------------------------------
G4Box* solidWorld = new G4Box( "World", //its name
<<<<<<< HEAD
world_sizeX,
world_sizeY,
world_sizeZ); //its size
//Prevent overlapping so the world size is doubled
=======
0.5 * world_sizeX,
0.5 * world_sizeY,
0.5 * world_sizeZ); //its size
>>>>>>> 247f4aad085b756a9fdbb30ec68ccec1ad1b97b7
G4LogicalVolume* logicWorld = new G4LogicalVolume( solidWorld, //its solid
world_mat, //its material
@ -260,24 +250,14 @@ G4VPhysicalVolume* SiPMDetectorConstruction::Construct()
0.5 * scintillator_size.getZ()); //its size
G4LogicalVolume* logicScint = new G4LogicalVolume( solidScint, //its solid
<<<<<<< HEAD
scint_mat, //its material
=======
scint_mat, //its material
>>>>>>> 247f4aad085b756a9fdbb30ec68ccec1ad1b97b7
"Scintillator"); //its name
G4VSolid* solidCoating = new G4SubtractionSolid("ScintillatorCoating",
solidScintCoating,
<<<<<<< HEAD
solidScint/*,
0,
G4ThreeVector(0, 0, 0)*/);
=======
solidScint,
0,
G4ThreeVector(0, 0, 0));
>>>>>>> 247f4aad085b756a9fdbb30ec68ccec1ad1b97b7
G4LogicalVolume* logicScintCoating = new G4LogicalVolume( solidCoating, //its solid
scint_coating, //its material
@ -287,11 +267,7 @@ G4VPhysicalVolume* SiPMDetectorConstruction::Construct()
posScint, //at position
logicScint, //its logical volume
"Scintillator", //its name
<<<<<<< HEAD
logicContainer, //its mother volume
=======
logicContainer, //its mother volume
>>>>>>> 247f4aad085b756a9fdbb30ec68ccec1ad1b97b7
false, //no boolean operation
0, //copy lxenumber
checkOverlaps); //overlaps checking
@ -390,11 +366,7 @@ G4VPhysicalVolume* SiPMDetectorConstruction::Construct()
scint_material_mpt -> AddProperty("ABSLENGTH", pp, absl, n);
scint_material_mpt -> AddProperty("SLOWCOMPONENT", pp, slow, n);
scint_material_mpt -> AddProperty("FASTCOMPONENT", pp, fast, n);
<<<<<<< HEAD
scint_material_mpt -> AddConstProperty("SCINTILLATIONYIELD", 1000./MeV); //50 volt
=======
scint_material_mpt -> AddConstProperty("SCINTILLATIONYIELD", 50000./MeV); //50 volt
>>>>>>> 247f4aad085b756a9fdbb30ec68ccec1ad1b97b7
scint_material_mpt -> AddConstProperty("RESOLUTIONSCALE", 1.0);
scint_material_mpt -> AddConstProperty("FASTTIMECONSTANT", 0.01*ns);
scint_material_mpt -> AddConstProperty("SLOWTIMECONSTANT", 1.*ns);
@ -407,11 +379,7 @@ G4VPhysicalVolume* SiPMDetectorConstruction::Construct()
G4LogicalBorderSurface *ScintillatorSurface = new G4LogicalBorderSurface("Scintillator Surface", physScint, physScintCoating, OpScintillatorSurface);
<<<<<<< HEAD
G4double reflectivityCoating[n] = {0.99, 0.99};
=======
G4double reflectivityCoating[n] = {0.9, 0.9};
>>>>>>> 247f4aad085b756a9fdbb30ec68ccec1ad1b97b7
G4double efficiencyCoating[n] = {0, 0};
G4MaterialPropertiesTable *ScintillatorToWolframMaterialPropertyTable = new G4MaterialPropertiesTable();
@ -461,7 +429,6 @@ G4VPhysicalVolume* SiPMDetectorConstruction::Construct()
{
snprintf(s1, 30, "Container_x%d_y%d", i, j);
logicContainer -> SetName(s1);
<<<<<<< HEAD
physContainer[i][j] = new G4PVPlacement( 0,
G4ThreeVector(i * container_sizeX + (container_sizeX / 2) - (world_sizeX / 2), j * container_sizeY + (container_sizeY / 2) - (world_sizeY / 2), container_sizeZ / 2),
logicContainer,
@ -471,17 +438,6 @@ G4VPhysicalVolume* SiPMDetectorConstruction::Construct()
copyNumber, //copy number
checkOverlaps);
copyNumber++;
=======
physContainer[x][y] = new G4PVPlacement(0,
G4ThreeVector(i * (container_sizeX / 2), j * (container_sizeY / 2), container_sizeZ / 2),
logicContainer,
s1, //its name
logicWorld,
false,
helper, //copy number
checkOverlaps);
helper++;
>>>>>>> 247f4aad085b756a9fdbb30ec68ccec1ad1b97b7
}
}
//------------------------------------------------------------------------------------------------------------------