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

Geometry COSI updates

parent b79031b3

code/MaterialsDefinition.cc

+7 −1
Original line number Diff line number Diff line
@@ -656,7 +656,7 @@ void MaterialsDefinition::DefineMaterials() { 
    H2O->AddElement(elO, natoms=1);



    // wood

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

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

    wood->AddElement(elH , 4);

    wood->AddElement(elO , 1);

    wood->AddElement(elC , 2);
@@ -667,6 +667,9 @@ void MaterialsDefinition::DefineMaterials() { 
    foam->AddElement(elH, 36);

    foam->AddElement(elN, 2);

    foam->AddElement(elO, 10);



    // Natural rubber

    natural_rubber = manNist->FindOrBuildMaterial("G4_RUBBER_NATURAL");

}
@@ -893,6 +896,9 @@ G4Material* MaterialsDefinition::GetMaterial(int index) { 
    case 73:

        dummat = foam;

        break;

    case 74:

        dummat = natural_rubber;

        break;

    }

    return dummat;

}

code/MaterialsDefinition.hh

+1 −0
Original line number Diff line number Diff line
@@ -245,6 +245,7 @@ public: 
    G4Material* wood;



    G4Material* foam;

    G4Material* natural_rubber;

geom/GeometryCOSI_ACS.cc

+1949 −6

File changed.

Preview size limit exceeded, changes collapsed.

geom/GeometryCOSI_ACS.hh

+2 −0
Original line number Diff line number Diff line
@@ -100,6 +100,8 @@ protected: 
    G4Material* glass_mat;

    G4Material* coat_mat;

    G4Material* foam_mat;

    G4Material* rubber_mat;

    G4Material* steel_mat;



private: