* Fixing issue with MUGAST analysis

* Fixing issue with Materal Manager: Mylar and Kapon were improperly
* define

Inputs/DetectorConfiguration/MUGAST.detector

@@ -3,7 +3,7 @@
 GeneralTarget
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1
 Target
-	THICKNESS= 1
+	THICKNESS= 0.94
 	RADIUS=	7.5
 	MATERIAL= CD2
 	X= 0

Inputs/EventGenerator/60Fe.reaction

@@ -3,7 +3,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 Beam
   Particle= 60Fe
-  Energy= 1628.41
+  Energy= 540
   SigmaEnergy= 0
 	SigmaX= 0
 	SigmaY= 0
@@ -19,9 +19,9 @@ TwoBodyReaction
 	Target= 2H
 	Light= 1H
 	Heavy= 61Fe
-	ExcitationEnergyHeavy= 0.0
+	ExcitationEnergyHeavy= 4.0
 	ExcitationEnergyLight= 0.0
-  CrossSectionPath= fe61_p3_2gs.txt CS
+  CrossSectionPath= CS_61dp_f.txt CS
 	ShootLight= 1
 	ShootHeavy= 0
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

NPAnalysis/MUGAST/Analysis.cxx

@@ -52,7 +52,7 @@ int main(int argc, char** argv){
   double ThetaNormalTarget = 0 ;
   double ThetaM2Surface = 0; 
   double Si_E_M2 = 0 ;
-  double SiLi_E_M2 = 0 ; 
+  double CsI_E_M2 = 0 ; 
   double Energy = 0;
   double E_M2 = 0;
   
@@ -97,12 +97,11 @@ int main(int argc, char** argv){
     myDetector->BuildPhysicalEvent();
     // Reinitiate calculated variable
     ReInitValue();
-    
     double XTarget = 0;
     double YTarget = 0;
     TVector3 BeamDirection = TVector3(0,0,1);
     double BeamEnergy = BeamCD2.Slow(OriginalBeamEnergy,Rand.Uniform(0,TargetThickness),0);
-    myReaction->SetBeamEnergy(273.4);
+    myReaction->SetBeamEnergy(BeamEnergy);
 
 
       //////////////////////////// LOOP on MUST2 //////////////////
@@ -128,12 +127,12 @@ int main(int argc, char** argv){
       // Part 2 : Impact Energy
       Energy = ELab = 0;
       Si_E_M2 = M2->Si_E[countMust2];
-      SiLi_E_M2= M2->SiLi_E[countMust2];
+      CsI_E_M2= M2->CsI_E[countMust2];
 
       // if SiLi
-      if(SiLi_E_M2>0 ){
+      if(CsI_E_M2>0 ){
         // The energy in CsI is calculate form dE/dx Table because 
-        Energy = SiLi_E_M2;
+        Energy = CsI_E_M2;
         Energy = LightAl.EvaluateInitialEnergy( Energy ,0.4*micrometer , ThetaM2Surface); 
         Energy+=Si_E_M2;
       }
@@ -189,9 +188,8 @@ int main(int argc, char** argv){
       Energy = ELab = 0;
       Energy = GD->GetEnergyDeposit();
       
-      ELab = LightAl.EvaluateInitialEnergy( Energy ,0.4*micrometer , ThetaGDSurface); 
       // Target Correction
-      ELab   = LightCD2.EvaluateInitialEnergy( ELab ,TargetThickness/2., ThetaNormalTarget);
+      ELab   = LightCD2.EvaluateInitialEnergy( Energy ,TargetThickness/2., ThetaNormalTarget);
       /************************************************/
 
       /************************************************/

NPAnalysis/MUGAST/Analysis.h

@@ -57,7 +57,7 @@ namespace ENERGYLOSS{
   EnergyLoss LightCD2 = EnergyLoss("proton_CD2.G4table","G4Table",100 );
   EnergyLoss LightAl = EnergyLoss("proton_Al.G4table","G4Table",100);
   EnergyLoss LightSi = EnergyLoss("proton_Si.G4table","G4Table",100);
-  EnergyLoss BeamCD2 = EnergyLoss("Kr74[0.0]_CD2.G4table","G4Table",100);
+  EnergyLoss BeamCD2 = EnergyLoss("Mg28[0.0]_CD2.G4table","G4Table",100);
 }
 
 using namespace ENERGYLOSS ;

NPAnalysis/MUGAST/RunToTreat.txt

 TTreeName 
 	SimulatedTree
 RootFileName 
- ../../Outputs/Simulation/74Kr_g.root
+ ../../Outputs/Simulation/28Mg.root

NPAnalysis/MUGAST/configs/ConfigMust2.dat

 ConfigMust2
 	MAX_STRIP_MULTIPLICITY 1
 	STRIP_ENERGY_MATCHING_NUMBER_OF_SIGMA 5
-  	STRIP_ENERGY_MATCHING_SIGMA 0.02
+  STRIP_ENERGY_MATCHING_SIGMA 0.02
 	DISABLE_CHANNEL MM1STRY12
 	DISABLE_CHANNEL MM2STRY12
 	DISABLE_CHANNEL MM3STRY12
 	DISABLE_CHANNEL MM4STRY12
 	DISABLE_CHANNEL MM1STRX12
-   DISABLE_CHANNEL MM2STRX12
-   DISABLE_CHANNEL MM3STRX12
-   DISABLE_CHANNEL MM4STRX12
-	DISABLE_CHANNEL MM1STRY124
-	DISABLE_CHANNEL MM4STRX3 
-	DISABLE_CHANNEL MM4STRX4
-	DISABLE_CHANNEL MM4STRX5
-	DISABLE_CHANNEL MM4STRX6
-	DISABLE_CHANNEL MM4STRX8
-	DISABLE_CHANNEL MM4STRX31
-	DISABLE_ALL MM5
-	DISABLE_ALL MM6
-	DISABLE_ALL MM7
-	DISABLE_ALL MM8
+  DISABLE_CHANNEL MM2STRX12
+  DISABLE_CHANNEL MM3STRX12
+  DISABLE_CHANNEL MM4STRX12
 	SI_X_E_RAW_THRESHOLD 0
   SILI_E_RAW_THRESHOLD 0
   CSI_E_RAW_THRESHOLD 0

NPSimulation/src/MaterialManager.cc

@@ -105,7 +105,7 @@ G4Material* MaterialManager::GetMaterialFromLibrary(string Name){
     }
 
     else  if(Name == "Mylar"){
-      G4Material* material = new G4Material(Name, 1.397*g,3);
+      G4Material* material = new G4Material(Name, 1.397*g/cm3,3);
       material->AddElement(GetElementFromLibrary("H"),8);
       material->AddElement(GetElementFromLibrary("C"),10);
       material->AddElement(GetElementFromLibrary("O"),4);
@@ -114,7 +114,7 @@ G4Material* MaterialManager::GetMaterialFromLibrary(string Name){
     }
 
     else  if(Name == "Kapton"){
-      G4Material* material = new G4Material(Name, 1.39*g,3);
+      G4Material* material = new G4Material(Name, 1.39*g/cm3,3);
       material->AddElement(GetElementFromLibrary("H"),4);
       material->AddElement(GetElementFromLibrary("C"),5);
       material->AddElement(GetElementFromLibrary("O"),2);