Commit 8a39d016 authored by Alex Ciabattoni's avatar Alex Ciabattoni
Browse files

Geometry COSI updates

parent 0bac8638

code/MaterialsDefinition.cc

+6 −0
Original line number Diff line number Diff line
@@ -661,6 +661,12 @@ void MaterialsDefinition::DefineMaterials() { 
    wood->AddElement(elO , 1);

    wood->AddElement(elC , 2);



    // wood2 (denser)

    wood2 = new G4Material(name="wood", density=0.9*g/cm3, ncomponents=3);

    wood2->AddElement(elH , 4);

    wood2->AddElement(elO , 1);

    wood2->AddElement(elC , 2);



    // Polyurethane foam (C27H36N2O10) (COSI BGO lab measurements)

    foam = new G4Material(name="foam", density=0.0319*g/cm3, ncomponents=4);

    foam->AddElement(elC, 27);

code/MaterialsDefinition.hh

+1 −0
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ public: 
    

    G4Material* H2O;

    G4Material* wood;

    G4Material* wood2;



    G4Material* foam;

    G4Material* natural_rubber;

geom/GeometryCOSI_ACS.cc

+3 −2
Original line number Diff line number Diff line
@@ -1578,6 +1578,7 @@ G4VPhysicalVolume* GeometryCOSI_ACS::ConstructGeometry(G4VPhysicalVolume* World_ 
        Al_mat = materials->GetMaterial(67);

        plastic_mat = materials->GetMaterial(71);

        wood_mat = materials->GetMaterial(72);

        wood2_mat = materials->GetMaterial(72);

        ej560_mat = materials->GetMaterial(63); /* optical coupler */

        sy184_mat = materials->GetMaterial(63);

        glass_mat = materials->GetMaterial(65);
@@ -4647,7 +4648,7 @@ G4VPhysicalVolume* GeometryCOSI_ACS::ConstructGeometry(G4VPhysicalVolume* World_ 
            G4double tableZ = 63.5;















            G4Box* solid_table = new G4Box("solid_table", tableX/2., tableY/2., tableZ/2.);













            G4LogicalVolume* log_table = new G4LogicalVolume(solid_table, wood_mat, "log_table");













            G4LogicalVolume* log_table = new G4LogicalVolume(solid_table, wood2_mat, "log_table");















            G4VPhysicalVolume* phys_table = new G4PVPlacement(0, G4ThreeVector(0., 0., -zlen-plasticZ-AlThick-coatThick-Al_layerZ-tableZ/2.), log_table, "table", log_chamber, false, table_copy, true);





























            G4VisAttributes* VisTable = new G4VisAttributes(G4Colour::Brown());










@@ -7198,7 +7199,7 @@ G4VPhysicalVolume* GeometryCOSI_ACS::ConstructGeometry(G4VPhysicalVolume* World_













            G4double table_posZ = mat_posZ - matZ/2. - tableZ/2.;





























            G4Box* solid_table = new G4Box("solid_table", tableX/2., tableY/2, tableZ/2.);













            G4LogicalVolume* log_table = new G4LogicalVolume(solid_table, wood_mat, "log_table");













            G4LogicalVolume* log_table = new G4LogicalVolume(solid_table, wood2_mat, "log_table");















            G4VPhysicalVolume* phys_table = new G4PVPlacement(0, G4ThreeVector(table_posX, table_posY, table_posZ), log_table, "table", log_chamber, false, table_copy, true);





























            G4VisAttributes* VisTable = new G4VisAttributes(G4Colour::Brown());

























geom/GeometryCOSI_ACS.hh



+1
−0




























Original line number
Diff line number
Diff line








@@ -96,6 +96,7 @@ protected:













    G4Material* tefl_mat;















    G4Material* plastic_mat;















    G4Material* wood_mat;













    G4Material* wood2_mat;















    G4Material* coll_mat;















    G4Material* glass_mat;















    G4Material* coat_mat;