Merge branch 'NPTool.2.dev' of https://gitlab.in2p3.fr/np/nptool into NPTool.2.dev

NPSimulation/Core/MaterialManager.cc

@@ -371,6 +371,20 @@ G4Material* MaterialManager::GetMaterialFromLibrary(string Name, double density)
       return material;
     }
 
+    else if (Name == "240Pu") {
+      if (!density)
+        density = 19.8 * g / cm3;
+      G4Element* Pu240 = new G4Element("Pu240", "Pu240", 1);
+
+      G4Isotope* isotope = new G4Isotope("240Pu", 94, 240);
+      Pu240->AddIsotope(isotope, 1);
+
+      G4Material* material = new G4Material("NPS_" + Name, density, 1, kStateSolid, 293.15 * kelvin);
+      material->AddElement(Pu240, 1);
+      m_Material[Name] = material;
+      return material;
+    }
+
     else if (Name == "Gd") {
       if (!density)
         density = 7.90 * g / cm3;

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;

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:

Projects/Epic_sim_proto/info.dat

+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%  EPIC PROTOTYPE WITH 250ug/cm2 SAMPLES OF 238U [6] AND 235U [4]  %%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 %%%%%%%%%%%%%%%%
 % 238U samples %
 %%%%%%%%%%%%%%%%
@@ -16,7 +20,7 @@
  K3:  z0= -8.35094 mm
  K4:  z0= -3.33307 mm
  K7:  z0= 3.33307 mm
- K8:  z0= 3.33307 mm
+ K8:  z0= 8.35094 mm
  
 %%%%%%%%%%%%%%%%%%%%%%%%%%%
 % COMMANDS FOR SIMULATION %
@@ -35,4 +39,34 @@
  TTree * tGEF = (TTree*)fGEF->Get("SimulatedTree")
  tGEF->Draw("Epic.fEpic_Data.Q1>>h_FF_Q1(3000,0,150)","","sames")
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%  PFNS FISSION CHAMBER LOADED WITH 240PU SAMPLES  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 
+%%%%%%%%%%%%%%%%%
+% 240Pu samples %
+%%%%%%%%%%%%%%%%%
+ InputDataFile= /home/audrey/EPIC/GEF_lmd_240Punf/En_10MeV_CN_241Pu.lmd
+ K1:  z0= -31.719 mm
+ K2:  z0= -26.701 mm
+ K3:  z0= -25.877 mm
+ K4:  z0= -20.859 mm
+ K5:  z0= -20.035 mm
+ K6:  z0= -15.017 mm
+ K7:  z0= -14.193 mm
+ K8:  z0= -9.17502 mm
+ K9:  z0= -8.35099 mm
+ K10: z0= -3.33302 mm
+ K11: z0= -2.50899 mm
+ K12: z0=  2.50898 mm
+ K13: z0=  3.33301 mm
+ K14: z0=  8.35098 mm
+ K15: z0=  9.17501 mm
+ K16: z0= 14.193 mm
+ K17: z0= 15.017 mm
+ K18: z0= 20.035 mm
+ K19: z0= 20.859 mm
+ K20: z0= 25.877 mm
+ K21: z0= 26.701 mm
+ K22: z0= 31.719 mm