diff --git a/NPSimulation/Detectors/Epic/Epic.cc b/NPSimulation/Detectors/Epic/Epic.cc index bd3c520651e38c99a53415501c873be553517bdd..e2dc885d08b4f7f58b00da0c47af786d44b13d8d 100644 --- a/NPSimulation/Detectors/Epic/Epic.cc +++ b/NPSimulation/Detectors/Epic/Epic.cc @@ -87,8 +87,9 @@ Epic::Epic(){ m_VisGas = new G4VisAttributes(G4Colour(0.576,0.662,0.662,0.1)); m_VisCu = new G4VisAttributes(G4Colour(0.70, 0.40, 0. ,1)); m_VisRogers4003C = new G4VisAttributes(G4Colour(0.60, 0.60, 0.2 ,1)); - m_VisSample238U = new G4VisAttributes(G4Colour(0.1, 0.60, 0.1 ,1)); - m_VisSample235U = new G4VisAttributes(G4Colour(1.0, 0.80, 0.0 ,1)); + m_VisSample235U = new G4VisAttributes(G4Colour(1.0 , 0.80, 0.0 ,1)); + m_VisSample238U = new G4VisAttributes(G4Colour(0.76, 0.88, 0.0 ,1)); + m_VisSamplePu = new G4VisAttributes(G4Colour(0.54, 0.88, 0.0 ,1)); } Epic::~Epic(){ @@ -468,8 +469,11 @@ void Epic::BuildSample(double Zpos, int indexA){ G4Tubs* sample_solid = new G4Tubs(m_SampleMaterial.at(indexA),0,16.5*mm,0.5*m_SampleThickness.at(indexA)*mm,0,360*deg); G4Material* sample_material = MaterialManager::getInstance()->GetMaterialFromLibrary(m_SampleMaterial.at(indexA)); G4LogicalVolume* sample_vol = new G4LogicalVolume(sample_solid, sample_material,"logic_sample",0,0,0); - if(m_SampleMaterial.at(indexA)=="238U") sample_vol->SetVisAttributes(m_VisSample238U); - if(m_SampleMaterial.at(indexA)=="235U") sample_vol->SetVisAttributes(m_VisSample235U); + if(m_SampleMaterial.at(indexA)=="235U") sample_vol->SetVisAttributes(m_VisSample235U); + if(m_SampleMaterial.at(indexA)=="238U") sample_vol->SetVisAttributes(m_VisSample238U); + if(m_SampleMaterial.at(indexA)=="238Pu" || + m_SampleMaterial.at(indexA)=="240Pu" || + m_SampleMaterial.at(indexA)=="242Pu") sample_vol->SetVisAttributes(m_VisSamplePu); G4RotationMatrix *Rv=new G4RotationMatrix(0,0,0); G4ThreeVector Tv; diff --git a/NPSimulation/Detectors/Epic/Epic.hh b/NPSimulation/Detectors/Epic/Epic.hh index 2c2261ad2509af933f89175f19202b512d2f0b17..5fbf90b88a1557d9172089171ebaa02441500911 100644 --- a/NPSimulation/Detectors/Epic/Epic.hh +++ b/NPSimulation/Detectors/Epic/Epic.hh @@ -129,8 +129,9 @@ class Epic : public NPS::VDetector{ G4VisAttributes* m_VisGas; G4VisAttributes* m_VisTi; G4VisAttributes* m_VisRogers4003C; - G4VisAttributes* m_VisSample238U; G4VisAttributes* m_VisSample235U; + G4VisAttributes* m_VisSample238U; + G4VisAttributes* m_VisSamplePu; // Needed for dynamic loading of the library public: