Commit ce059451 authored by Alex Ciabattoni's avatar Alex Ciabattoni
Browse files

Geometry COSI updates

parent 97766419

code/MaterialsDefinition.cc

+10 −0
Original line number Diff line number Diff line
@@ -660,6 +660,13 @@ void MaterialsDefinition::DefineMaterials() { 
    wood->AddElement(elH , 4);

    wood->AddElement(elO , 1);

    wood->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);

    foam->AddElement(elH, 36);

    foam->AddElement(elN, 2);

    foam->AddElement(elO, 10);

}
@@ -883,6 +890,9 @@ G4Material* MaterialsDefinition::GetMaterial(int index) { 
    case 72:

        dummat = wood;

        break;

    case 73:

        dummat = foam;

        break;

    }

    return dummat;

}

code/MaterialsDefinition.hh

+2 −0
Original line number Diff line number Diff line
@@ -244,6 +244,8 @@ public: 
    G4Material* H2O;

    G4Material* wood;



    G4Material* foam;

geom/GeometryCOSI_ACS.cc

+2 −1
Original line number Diff line number Diff line
@@ -1471,6 +1471,7 @@ G4VPhysicalVolume* GeometryCOSI_ACS::ConstructGeometry(G4VPhysicalVolume* World_ 
        SiPM_mat = materials->GetMaterial(12);

        coll_mat = materials->GetMaterial(3);

        coat_mat = materials->GetMaterial(44);

        foam_mat = materials->GetMaterial(73);





        /* --------------------- MATERIAL OPTICAL PROPERTIES ----------------------- */
@@ -4579,7 +4580,7 @@ G4VPhysicalVolume* GeometryCOSI_ACS::ConstructGeometry(G4VPhysicalVolume* World_ 
                G4Tubs* tube_sub = new G4Tubs("tube_sub", 0., 56, foamZ, 0., 360.);

                G4SubtractionSolid* solid_foam = new G4SubtractionSolid("solid_foam", solid_foam_notsub, tube_sub, 0, G4ThreeVector(0., -foamY/2., 0.));



                G4LogicalVolume* log_foam = new G4LogicalVolume(solid_foam, coat_mat, "log_foam");

                G4LogicalVolume* log_foam = new G4LogicalVolume(solid_foam, foam_mat, "log_foam");



                G4VPhysicalVolume* phys_foam = new G4PVPlacement(0, G4ThreeVector(0., 0., coatZ/2.-AlThick-coatThick-zlen-plasticZ+coatZ/2.+foamZ/2.), log_foam, "foam", log_chamber, false, foam_copy, true);

geom/GeometryCOSI_ACS.hh

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ protected: 
    G4Material* coll_mat;

    G4Material* glass_mat;

    G4Material* coat_mat;

    G4Material* foam_mat;



private: