* Fixing bug for 3He in EventGeneratorIsotropic.cc

Inputs/EventGenerator/3He.source

@@ -11,6 +11,7 @@ Isotropic
 	x0= 0	
 	y0= 0	
 	z0= 0	
-	particle= 3He
+	Multiplicity= 1
+  Particle= 3He
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Supported particle type: proton, neutron, deuton, triton, He3 , alpha 

NPSimulation/Core/EventGeneratorIsotropic.cc

@@ -204,6 +204,7 @@ void EventGeneratorIsotropic::ReadConfiguration(string Path,int){
                     if(DataBuffer=="proton"){ m_particleName.push_back("1H")  ; check_ExcitationEnergy = true ;}
                     else if(DataBuffer=="deuton"){ m_particleName.push_back("2H")  ; check_ExcitationEnergy = true ;}
                     else if(DataBuffer=="triton"){ m_particleName.push_back("3H")  ; check_ExcitationEnergy = true ;}
+                    else if(DataBuffer=="3He" || DataBuffer=="He3") { m_particleName.push_back("3He") ; check_ExcitationEnergy = true ;}
                     else if(DataBuffer=="alpha") { m_particleName.push_back("4He") ; check_ExcitationEnergy = true ;}
                     else if(DataBuffer=="gamma") { m_particleName.push_back("gamma") ; check_ExcitationEnergy = true ;}
                     else if(DataBuffer=="neutron") {m_particleName.push_back("neutron") ; check_ExcitationEnergy = true ;}

NPSimulation/Core/NPIonIonInelasticPhysic.cc

@@ -96,11 +96,18 @@ void NPIonIonInelasticPhysic::ConstructProcess()
     ligthBinary -> SetMinEnergy(0*MeV);
     ligthBinary -> SetMaxEnergy(10*GeV);
     
-    /*G4GeneralSpaceNNCrossSection* GeneralSpaceNNCrossSection =*/ new G4GeneralSpaceNNCrossSection;
+    //G4GeneralSpaceNNCrossSection* GeneralSpaceNNCrossSection = new G4GeneralSpaceNNCrossSection;
+    
+    // Tripathi
     G4TripathiCrossSection* TripathiCrossSections = new G4TripathiCrossSection;
     G4TripathiLightCrossSection* TripathiLightCrossSections = new G4TripathiLightCrossSection;
+    
+    //Shen
     G4IonsShenCrossSection* ShenCrossSections = new G4IonsShenCrossSection;
     
+    // Glauber
+    G4ComponentGGHadronNucleusXsc* GlauberGribovCrossSection = new G4ComponentGGHadronNucleusXsc();
+    G4CrossSectionInelastic* GlauberGribovDataSet = new G4CrossSectionInelastic(GlauberGribovCrossSection);
     
     // ******************
     // **** Elastic ****
@@ -135,7 +142,7 @@ void NPIonIonInelasticPhysic::ConstructProcess()
     //protonInelasticProcess -> AddDataSet(ShenCrossSections);
     //protonInelasticProcess -> AddDataSet(TripathiCrossSections);
     //protonInelasticProcess -> AddDataSet(TripathiLightCrossSections);
-   // protonInelasticProcess -> AddDataSet(GlauberGribovDataSet);
+    protonInelasticProcess -> AddDataSet(GlauberGribovDataSet);
     
     protonInelasticProcess -> RegisterMe(ligthBinary);
     //protonInelasticProcess -> RegisterMe(JQMDmodel);
@@ -145,9 +152,10 @@ void NPIonIonInelasticPhysic::ConstructProcess()
     processManager -> AddDiscreteProcess(protonInelasticProcess);
     
     double energy = 0;
-   // int Z = 50;
-   // int A = 120;
+    //int Z = 50;
+    //int A = 120;
 
+    particle = G4Proton::Proton();
     for(int i=0; i<500;i++){
         energy += 1;
         
@@ -174,9 +182,10 @@ void NPIonIonInelasticPhysic::ConstructProcess()
     // ****************
     G4DeuteronInelasticProcess* deuteronInelasticProcess = new G4DeuteronInelasticProcess;
     
-    deuteronInelasticProcess -> AddDataSet(ShenCrossSections);
-    deuteronInelasticProcess -> AddDataSet(TripathiCrossSections);
-    deuteronInelasticProcess -> AddDataSet(TripathiLightCrossSections);
+    //deuteronInelasticProcess -> AddDataSet(ShenCrossSections);
+    //deuteronInelasticProcess -> AddDataSet(TripathiCrossSections);
+    //deuteronInelasticProcess -> AddDataSet(TripathiLightCrossSections);
+    deuteronInelasticProcess -> AddDataSet(GlauberGribovDataSet);
     
     deuteronInelasticProcess -> RegisterMe(ligthBinary);
     //deuteronInelasticProcess -> RegisterMe(JQMDmodel);
@@ -191,9 +200,10 @@ void NPIonIonInelasticPhysic::ConstructProcess()
     // **************
     G4TritonInelasticProcess* tritonInelasticProcess = new G4TritonInelasticProcess;
     
-    tritonInelasticProcess -> AddDataSet(ShenCrossSections);
-    tritonInelasticProcess -> AddDataSet(TripathiCrossSections);
-    tritonInelasticProcess -> AddDataSet(TripathiLightCrossSections);
+    //tritonInelasticProcess -> AddDataSet(ShenCrossSections);
+    //tritonInelasticProcess -> AddDataSet(TripathiCrossSections);
+    //tritonInelasticProcess -> AddDataSet(TripathiLightCrossSections);
+    tritonInelasticProcess -> AddDataSet(GlauberGribovDataSet);
     
     tritonInelasticProcess -> RegisterMe(ligthBinary);
     //tritonInelasticProcess -> RegisterMe(JQMDmodel);
@@ -208,9 +218,10 @@ void NPIonIonInelasticPhysic::ConstructProcess()
     // *************
     G4AlphaInelasticProcess* alphaInelasticProcess = new G4AlphaInelasticProcess;
     
-    alphaInelasticProcess -> AddDataSet(ShenCrossSections);
-    alphaInelasticProcess -> AddDataSet(TripathiCrossSections);
-    alphaInelasticProcess -> AddDataSet(TripathiLightCrossSections);
+    //alphaInelasticProcess -> AddDataSet(ShenCrossSections);
+    //alphaInelasticProcess -> AddDataSet(TripathiCrossSections);
+    //alphaInelasticProcess -> AddDataSet(TripathiLightCrossSections);
+    //alphaInelasticProcess -> AddDataSet(GlauberGribovDataSet);
     
     alphaInelasticProcess -> RegisterMe(ligthBinary);
     //alphaInelasticProcess -> RegisterMe(JQMDmodel);
@@ -226,8 +237,9 @@ void NPIonIonInelasticPhysic::ConstructProcess()
     G4IonInelasticProcess* genericIonInelasticProcess = new G4IonInelasticProcess();
     
     genericIonInelasticProcess -> AddDataSet(ShenCrossSections);
-    genericIonInelasticProcess -> AddDataSet(TripathiCrossSections);
-    genericIonInelasticProcess -> AddDataSet(TripathiLightCrossSections);
+    //genericIonInelasticProcess -> AddDataSet(TripathiCrossSections);
+    //genericIonInelasticProcess -> AddDataSet(TripathiLightCrossSections);
+    //genericIonInelasticProcess -> AddDataSet(GlauberGribovDataSet);
     
     genericIonInelasticProcess -> RegisterMe(ligthBinary);
     //genericIonInelasticProcess -> RegisterMe(JQMDmodel);

NPSimulation/ressources/macro/vis.mac

@@ -49,8 +49,8 @@
 /vis/viewer/set/autoRefresh true
 /vis/verbose 0
 
-#/vis/viewer/set/background black 
-/vis/viewer/set/background white
+/vis/viewer/set/background black 
+#/vis/viewer/set/background white
 
 # print Option
 #/vis/ogl/set/printMode vectored