Commit e5cf316c authored by Valentina Fioretti's avatar Valentina Fioretti
Browse files

Merge branch 'main' of https://www.ict.inaf.it/gitlab/icsc_g4_hpc/BoGEMMS-HPC

parents 7f71a49c ce059451

code/CEventAction.cc

+3 −1
Original line number Diff line number Diff line
@@ -94,7 +94,9 @@ void CEventAction::BeginOfEventAction(const G4Event* evt) { 
    drawEvent = false;

    G4int event_id = evt->GetEventID();

    gm.event_id = event_id;



    //G4int evtID = evt->GetEventID();

    //G4double ene = evt->GetPrimaryVertex(0)->GetPrimary(0)->GetKineticEnergy();

    //G4cout << "Event ID: " << evtID << ", with energy: " << ene/CLHEP::keV << " keV" << G4endl;



}

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

+715 −2

File changed.

Preview size limit exceeded, changes collapsed.

geom/GeometryCOSI_ACS.hh

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

    G4Material* coll_mat;

    G4Material* glass_mat;

    G4Material* coat_mat;

    G4Material* foam_mat;



private: