Loading geom/GeometryCOSI_ACS.cc +12 −12 Original line number Diff line number Diff line Loading @@ -7387,9 +7387,9 @@ G4VPhysicalVolume* GeometryCOSI_ACS::ConstructGeometry(G4VPhysicalVolume* World_ /* Plastic casing aroung source */ G4int casing_copy = 45; G4double casingX = 25.4; G4double casingY = 25.4; G4double casingZ = 15.875; G4double casingX = 27.4; G4double casingY = 27.4; G4double casingZ = 17.875; G4double casingThick = 1.; G4double casing_posX = foam_posX; Loading @@ -7415,7 +7415,7 @@ G4VPhysicalVolume* GeometryCOSI_ACS::ConstructGeometry(G4VPhysicalVolume* World_ G4double foam_sourceX = casingX-casingThick*2.; G4double foam_sourceY = casingY-casingThick*2.; G4double foam_sourceZ = (casingZ-casingThick*2.)*3./4.; G4double foam_sourceZ = 9.525; G4double foam_source_posX = casing_posX; G4double foam_source_posY = casing_posY; Loading @@ -7434,16 +7434,16 @@ G4VPhysicalVolume* GeometryCOSI_ACS::ConstructGeometry(G4VPhysicalVolume* World_ // Source case G4int sourceCase_copy = 47; G4double sourceCaseR = 11.7; G4double sourceCase_halfH = 1.734375; G4double sourceCaseR = 12.7; G4double sourceCaseH = 6.35; G4double sourceR = 2.5; G4double sourceH = 3.18; G4double sourceCase_posX = -47.6; G4double sourceCase_posY = 0.; G4double sourceCase_posZ = 617.191125; G4double sourceCase_posZ = casing_posZ - casingZ/2. + casingThick + foam_sourceZ + sourceCaseH/2.; // 617.75 mm G4Tubs* solid_source_notsub = new G4Tubs("solid_source_notsub", 0., sourceCaseR, sourceCase_halfH, 0., 360.); G4Tubs* solid_source_notsub = new G4Tubs("solid_source_notsub", 0., sourceCaseR, sourceCaseH/2., 0., 360.); G4Tubs* source_cavity = new G4Tubs("source_cavity", 0., sourceR, sourceH/2. ,0., 360.); G4SubtractionSolid* solid_sourceCase = new G4SubtractionSolid("solid_sourceCase", solid_source_notsub, source_cavity, 0, G4ThreeVector(0., 0., 0.)); G4LogicalVolume* log_sourceCase = new G4LogicalVolume(solid_sourceCase, peek_mat, "log_sourceCase"); Loading @@ -7460,16 +7460,16 @@ G4VPhysicalVolume* GeometryCOSI_ACS::ConstructGeometry(G4VPhysicalVolume* World_ else { G4int sourceCase_copy = 47; G4double sourceCaseR = 11.7; G4double sourceCase_halfH = 1.734375; G4double sourceCaseR = 12.7; G4double sourceCaseH = 6.35; G4double sourceR = 2.5; G4double sourceH = 3.18; G4double sourceCase_posX = -47.6; G4double sourceCase_posY = 0.; G4double sourceCase_posZ = 605.784375; G4double sourceCase_posZ = foam_posZ + foamZ/2. + sourceCaseH/2.; // 607.225 mm G4Tubs* solid_source_notsub = new G4Tubs("solid_source_notsub", 0., sourceCaseR, sourceCase_halfH, 0., 360.); G4Tubs* solid_source_notsub = new G4Tubs("solid_source_notsub", 0., sourceCaseR, sourceCaseH/2., 0., 360.); G4Tubs* source_cavity = new G4Tubs("source_cavity", 0., sourceR, sourceH/2. ,0., 360.); G4SubtractionSolid* solid_sourceCase = new G4SubtractionSolid("solid_sourceCase", solid_source_notsub, source_cavity, 0, G4ThreeVector(0., 0., 0.)); G4LogicalVolume* log_sourceCase = new G4LogicalVolume(solid_sourceCase, peek_mat, "log_sourceCase"); Loading
geom/GeometryCOSI_ACS.cc +12 −12 Original line number Diff line number Diff line Loading @@ -7387,9 +7387,9 @@ G4VPhysicalVolume* GeometryCOSI_ACS::ConstructGeometry(G4VPhysicalVolume* World_ /* Plastic casing aroung source */ G4int casing_copy = 45; G4double casingX = 25.4; G4double casingY = 25.4; G4double casingZ = 15.875; G4double casingX = 27.4; G4double casingY = 27.4; G4double casingZ = 17.875; G4double casingThick = 1.; G4double casing_posX = foam_posX; Loading @@ -7415,7 +7415,7 @@ G4VPhysicalVolume* GeometryCOSI_ACS::ConstructGeometry(G4VPhysicalVolume* World_ G4double foam_sourceX = casingX-casingThick*2.; G4double foam_sourceY = casingY-casingThick*2.; G4double foam_sourceZ = (casingZ-casingThick*2.)*3./4.; G4double foam_sourceZ = 9.525; G4double foam_source_posX = casing_posX; G4double foam_source_posY = casing_posY; Loading @@ -7434,16 +7434,16 @@ G4VPhysicalVolume* GeometryCOSI_ACS::ConstructGeometry(G4VPhysicalVolume* World_ // Source case G4int sourceCase_copy = 47; G4double sourceCaseR = 11.7; G4double sourceCase_halfH = 1.734375; G4double sourceCaseR = 12.7; G4double sourceCaseH = 6.35; G4double sourceR = 2.5; G4double sourceH = 3.18; G4double sourceCase_posX = -47.6; G4double sourceCase_posY = 0.; G4double sourceCase_posZ = 617.191125; G4double sourceCase_posZ = casing_posZ - casingZ/2. + casingThick + foam_sourceZ + sourceCaseH/2.; // 617.75 mm G4Tubs* solid_source_notsub = new G4Tubs("solid_source_notsub", 0., sourceCaseR, sourceCase_halfH, 0., 360.); G4Tubs* solid_source_notsub = new G4Tubs("solid_source_notsub", 0., sourceCaseR, sourceCaseH/2., 0., 360.); G4Tubs* source_cavity = new G4Tubs("source_cavity", 0., sourceR, sourceH/2. ,0., 360.); G4SubtractionSolid* solid_sourceCase = new G4SubtractionSolid("solid_sourceCase", solid_source_notsub, source_cavity, 0, G4ThreeVector(0., 0., 0.)); G4LogicalVolume* log_sourceCase = new G4LogicalVolume(solid_sourceCase, peek_mat, "log_sourceCase"); Loading @@ -7460,16 +7460,16 @@ G4VPhysicalVolume* GeometryCOSI_ACS::ConstructGeometry(G4VPhysicalVolume* World_ else { G4int sourceCase_copy = 47; G4double sourceCaseR = 11.7; G4double sourceCase_halfH = 1.734375; G4double sourceCaseR = 12.7; G4double sourceCaseH = 6.35; G4double sourceR = 2.5; G4double sourceH = 3.18; G4double sourceCase_posX = -47.6; G4double sourceCase_posY = 0.; G4double sourceCase_posZ = 605.784375; G4double sourceCase_posZ = foam_posZ + foamZ/2. + sourceCaseH/2.; // 607.225 mm G4Tubs* solid_source_notsub = new G4Tubs("solid_source_notsub", 0., sourceCaseR, sourceCase_halfH, 0., 360.); G4Tubs* solid_source_notsub = new G4Tubs("solid_source_notsub", 0., sourceCaseR, sourceCaseH/2., 0., 360.); G4Tubs* source_cavity = new G4Tubs("source_cavity", 0., sourceR, sourceH/2. ,0., 360.); G4SubtractionSolid* solid_sourceCase = new G4SubtractionSolid("solid_sourceCase", solid_source_notsub, source_cavity, 0, G4ThreeVector(0., 0., 0.)); G4LogicalVolume* log_sourceCase = new G4LogicalVolume(solid_sourceCase, peek_mat, "log_sourceCase");