* Update on Mugast analysis

NPLib/Detectors/Mugast/TMugastPhysics.cxx

@@ -997,7 +997,8 @@ void TMugastPhysics::AddTelescope(MG_DetectorType type,double theta, double phi,
   m_StripPositionZ.push_back(OneTelescopeStripPositionZ);
 }
 
-TVector3 TMugastPhysics::GetPositionOfInteraction(const int i) {
+///////////////////////////////////////////////////////////////////////////////
+TVector3 TMugastPhysics::GetPositionOfInteraction(const int i,bool random) {
   TVector3 Position
     = TVector3(GetStripPositionX(TelescopeNumber[i], DSSD_X[i], DSSD_Y[i]),
         GetStripPositionY(TelescopeNumber[i], DSSD_X[i], DSSD_Y[i]),
@@ -1006,6 +1007,7 @@ TVector3 TMugastPhysics::GetPositionOfInteraction(const int i) {
   return Position;
 }
 
+///////////////////////////////////////////////////////////////////////////////
 TVector3 TMugastPhysics::GetTelescopeNormal(const int i) {
   TVector3 U = TVector3(GetStripPositionX(TelescopeNumber[i], 128, 1),
       GetStripPositionY(TelescopeNumber[i], 128, 1),

NPLib/Detectors/Mugast/TMugastPhysics.h

@@ -204,7 +204,7 @@ class TMugastPhysics : public TObject, public NPL::VDetector {
 
   double GetEnergyDeposit(const int i) const { return TotalEnergy[i]; };
 
-  TVector3 GetPositionOfInteraction(const int i) ;
+  TVector3 GetPositionOfInteraction(const int i,bool random=false) ;
   TVector3 GetTelescopeNormal(const int i) ;
 
   private: //   Parameter used in the analysis

Projects/MUGAST/Analysis.cxx

@@ -130,6 +130,7 @@ void Analysis::TreatEvent() {
     BeamDirection = TVector3(0,0,1);
     OriginalELab = ReactionConditions->GetKineticEnergy(0);
     OriginalThetaLab = ReactionConditions->GetTheta(0);
+    BeamEnergy = ReactionConditions->GetBeamEnergy();
   }
   BeamImpact = TVector3(XTarget,YTarget,0); 
   // determine beam energy for a randomized interaction point in target
@@ -308,6 +309,7 @@ void Analysis::InitOutputBranch() {
   else{
     RootOutput::getInstance()->GetTree()->Branch("OriginalELab",&OriginalELab,"OriginalELab/D");
     RootOutput::getInstance()->GetTree()->Branch("OriginalThetaLab",&OriginalThetaLab,"OriginalThetaLab/D");
+    RootOutput::getInstance()->GetTree()->Branch("BeamEnergy",&BeamEnergy,"BeamEnergy/D");
   }
 }
 
@@ -346,6 +348,7 @@ void Analysis::ReInitValue(){
   Ex = -1000 ;
   EDC= -1000;
   ELab = -1000;
+  BeamEnergy = -1000;
   ThetaLab = -1000;
   ThetaCM = -1000;
   X = -1000;

Projects/MUGAST/Analysis.h

@@ -86,6 +86,7 @@ class Analysis: public NPL::VAnalysis{
   double Si_E_M2 ;
   double CsI_E_M2  ;
   double Energy ;
+  double BeamEnergy;
   
   double ThetaGDSurface ;
   double X ;

Projects/MUGAST/ShowResults.C

@@ -99,6 +99,8 @@ void ShowResults(){
   t->Draw("ELab-OriginalELab>>hcE","","col");
   TLine* lE = new TLine(0,0,60,60);
   //lE->Draw();
-
+  c2->cd(3);
+  TH1F* hcBE = new TH1F("hcBE", "hcBE", 100, 90, 100);
+  t->Draw("BeamEnergy>>hcBE","","");
 }
 

Projects/MUGAST/e793.detector

 %%%%%%%%%%Detector%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1
 Target
- THICKNESS= 0.1 micrometer
+ THICKNESS= 9.43 micrometer
  ANGLE= 0 deg
  RADIUS= 10 mm
- MATERIAL= Vacuum
+ MATERIAL= CD2 
  X= 0 mm
  Y= 0 mm
  Z= 0 mm