Commit 2a4681fb authored by Alfonso's avatar Alfonso
Browse files

lower optCoupler

parent f7be5d81

include/DetectorConstruction.hh

+2 −1
Original line number Original line Diff line number Diff line
@@ -203,7 +203,8 @@ class DetectorConstruction : public G4VUserDetectorConstruction 
		G4VPhysicalVolume* scint_phys;

		G4VPhysicalVolume* scint_phys;

        G4VPhysicalVolume* sddUpper_phys;

        G4VPhysicalVolume* sddUpper_phys;

        G4VPhysicalVolume* sddLower_phys;

        G4VPhysicalVolume* sddLower_phys;

        G4VPhysicalVolume* optCoupler_phys;

        G4VPhysicalVolume* optCouplerUpper_phys;

        G4VPhysicalVolume* optCouplerLower_phys;

        G4VPhysicalVolume* coll_sideXp_phys;

        G4VPhysicalVolume* coll_sideXp_phys;

        G4VPhysicalVolume* coll_sideXm_phys;

        G4VPhysicalVolume* coll_sideXm_phys;

        G4VPhysicalVolume* coll_sideYp_phys;

        G4VPhysicalVolume* coll_sideYp_phys;

src/DetectorConstruction.cc

+21 −9
Original line number Original line Diff line number Diff line
@@ -78,7 +78,8 @@ DetectorConstruction::DetectorConstruction() 
	scint_phys(0),

	scint_phys(0),

    sddUpper_phys(0),

    sddUpper_phys(0),

    sddLower_phys(0),

    sddLower_phys(0),

    optCoupler_phys(0),

    optCouplerUpper_phys(0),

    optCouplerLower_phys(0),

    polyprop_phys(0),

    polyprop_phys(0),

    coll_sideXp_phys(0),

    coll_sideXp_phys(0),

    coll_sideXm_phys(0),

    coll_sideXm_phys(0),
@@ -556,7 +557,7 @@ G4VPhysicalVolume* DetectorConstruction::Construct() 




    G4double sddLower_x = 0;

    G4double sddLower_x = 0;

    G4double sddLower_y = 0;

    G4double sddLower_y = 0;

    G4double sddLower_z = -scint_z - sdd_thick/2.;

    G4double sddLower_z = -scint_z - optCoupler_thick - sdd_thick/2.;

    sddLower_phys = new G4PVPlacement(0,

    sddLower_phys = new G4PVPlacement(0,

                                        G4ThreeVector(sddLower_x,sddLower_y,sddLower_z),

                                        G4ThreeVector(sddLower_x,sddLower_y,sddLower_z),

                                        sddLower_log,

                                        sddLower_log,
@@ -574,13 +575,24 @@ G4VPhysicalVolume* DetectorConstruction::Construct() 
    optCoupler_log = new G4LogicalVolume(optCoupler_box, optCouplerMaterial, "optCoupler_log", 0, 0, 0);

    optCoupler_log = new G4LogicalVolume(optCoupler_box, optCouplerMaterial, "optCoupler_log", 0, 0, 0);

    

    

    // Physical

    // Physical

    G4double optCoupler_x = 0;

    G4double optCouplerUpper_x = 0;

    G4double optCoupler_y = 0;

    G4double optCouplerUpper_y = 0;

    G4double optCoupler_z = optCoupler_thick/2.;

    G4double optCouplerUpper_z = optCoupler_thick/2.;

    optCoupler_phys = new G4PVPlacement(0,

    optCouplerUpper_phys = new G4PVPlacement(0,

                                        G4ThreeVector(optCoupler_x,optCoupler_y,optCoupler_z),

                                        G4ThreeVector(optCouplerUpper_x,optCouplerUpper_y,optCouplerUpper_z),

                                        optCoupler_log,

                                        optCoupler_log,

                                        "optCoupler_phys",

                                        "optCouplerUpper_phys",

                                        experimentalHall_log,

                                        false,

                                        0);



    G4double optCouplerLower_x = 0;

    G4double optCouplerLower_y = 0;

    G4double optCouplerLower_z = -scint_z - optCoupler_thick/2.;

    optCouplerUpper_phys = new G4PVPlacement(0,

                                        G4ThreeVector(optCouplerLower_x,optCouplerLower_y,optCouplerLower_z),

                                        optCoupler_log,

                                        "optCouplerLower_phys",

                                        experimentalHall_log,

                                        experimentalHall_log,

                                        false,

                                        false,

                                        0);

                                        0);

xgis_M7

(471 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file