diff --git a/grb00.mac b/grb00.mac index 312e4898f1907e85e6d22ef1de78cae6a5ee772c..9b1c3f70f2a52519254a6f336f8fa052438f1432 100644 --- a/grb00.mac +++ b/grb00.mac @@ -121,4 +121,4 @@ /gps/pos/rot2 1.000 0.000 -0.000 /gps/direction -0.000 -0.000 -1.000 -/run/beamOn 10000000 +/run/beamOn 100 diff --git a/src/DetectorConstruction.cc b/src/DetectorConstruction.cc index 5bb649b99f5d9cb7d42f90e3d4ae74f2ab93c9ba..ff53abc4d728e98f402c3d416251fa86c8b5d753 100644 --- a/src/DetectorConstruction.cc +++ b/src/DetectorConstruction.cc @@ -348,7 +348,8 @@ void DetectorConstruction::DefineMaterials() G4Material* FR4 = new G4Material("FR4", density = 1.8*g/cm3, ncomponents=2); FR4 -> AddMaterial(G4_SILICON_DIOXIDE, fractionmass=60*perCent); FR4 -> AddMaterial(Epoxy_Resin, fractionmass=40*perCent); - fr4Material = FR4; // G4Material::GetMaterial("FR4"); + fr4Material = FR4; + //fr4Material = G4Material::GetMaterial("FR4"); // Default materials of the World: vacuum defaultMaterial = Vacuum; @@ -591,7 +592,7 @@ G4VPhysicalVolume* DetectorConstruction::Construct() G4double pcb_side_x = coll_side_x; G4double pcb_side_y = coll_side_y; G4double pcb_thick = 1.6 *mm; // ! si potrebbe mettere come parametro - G4double pcb_height = optCoupler_thick+sdd_thick+pcb_thick; + G4double pcb_height = optCoupler_thick+sdd_thick; G4Box* pcb_container_box = new G4Box("pcb_container_box", pcb_side_x/2., pcb_side_y/2., pcb_thick/2.); @@ -607,11 +608,9 @@ G4VPhysicalVolume* DetectorConstruction::Construct() false, 0); - // Solid G4double pcb_elem_side_x = 3.*mm; G4double pcb_elem_side_y = pcb_side_y; - G4cout << "Materiale FR4: " << fr4Material->GetName() << G4endl; G4Box* pcb_box = new G4Box("pcb_box", pcb_elem_side_x/2., pcb_elem_side_y/2., pcb_thick/2.); @@ -619,18 +618,9 @@ G4VPhysicalVolume* DetectorConstruction::Construct() pcb_log = new G4LogicalVolume(pcb_box, fr4Material, "pcb_log", 0, 0, 0); // Physical - G4int n_rep = (n_side-1)/2; // repliche di PCB usando il numero di scintillatori per side + G4int n_rep = (n_side-1)/2; pcbParam = new PCBParameterisation(pcb_elem_side_x, pcb_elem_side_y, pcb_height, pcb_thick, n_rep); - - G4cout << " pcb_elem_side_x " << pcb_elem_side_x/mm << G4endl; - G4cout << " pcb_elem_side_y " << pcb_elem_side_y/mm << G4endl; - G4cout << " pcb_height " << pcb_height << G4endl; - G4cout << " pcb_thick " << pcb_thick/mm << G4endl; - - G4cout << " pcb_sie_x " << pcb_side_x << G4endl; - G4cout << " n_rep " << n_rep << G4endl; - pcb_phys = new G4PVParameterised("pcb_phys", // their name pcb_log, // their logical volume @@ -988,7 +978,7 @@ G4VPhysicalVolume* DetectorConstruction::Construct() G4Colour white (1.0, 1.0, 1.0); G4Colour red (1.0, 0.0, 0.0); G4Colour green (0.0, 1.0, 0.0); - G4Colour dgreen (0.0, 0.8, 0.0); + G4Colour dgreen (0.0, 0.6, 0.0); G4Colour blue (0.0, 0.0, 1.0); G4Colour yellow (1.0, 1.0, 0.0); G4Colour magenta (1.0, 0.0, 1.0); diff --git a/src/PCBParameterisation.cc b/src/PCBParameterisation.cc index 51d6721ea261a3045d874f47b11559c758cfcec5..cd13ffbf89d975586b4ac10d8e947ece9f57808e 100644 --- a/src/PCBParameterisation.cc +++ b/src/PCBParameterisation.cc @@ -28,13 +28,7 @@ void PCBParameterisation::ComputeTransformation (const G4int copyNo, G4VPhysical G4double yPos = 0.*cm; G4double zPos = fHeight; - xPos = (-fLength)/2. +1.*cm + copyNo* 1.*cm; //sono al centro della barra capisci se indietreggiare di mezza barra - - G4cout << " copyNo " << copyNo << G4endl; - G4cout << " fSpacing " << fSpacing << G4endl; - G4cout << " zPos " << zPos << G4endl; - G4cout << " fLength " << fLength << G4endl; - G4cout << " fSpacing " << fSpacing << G4endl; + xPos = (-fLength)/2. +1.*cm + copyNo* 1.*cm; physVol->SetTranslation(G4ThreeVector(xPos, yPos, zPos)); diff --git a/xgis_M7 b/xgis_M7 index 2ea2623b38e0eb20b5d9a31537739a3acc0ab880..19f179d76f07eb668e96d750a9f801b485135261 100755 Binary files a/xgis_M7 and b/xgis_M7 differ diff --git a/xgis_M7.cc b/xgis_M7.cc index a2fdfc20a68b71314c339a97f782f4cece722540..193ae60cbb7115662ab91aa6680595252ea53129 100644 --- a/xgis_M7.cc +++ b/xgis_M7.cc @@ -42,7 +42,7 @@ int main(int argc, char **argv) #else G4RunManager * runManager = new G4RunManager; #endif - + //runManager->SetVerboseLevel(2); // Set mandatory initialization classes runManager->SetUserInitialization(new DetectorConstruction()); runManager->SetUserInitialization(new PhysicsList());