From 78d79e508cb310f6c4d35999931f215cff0807e1 Mon Sep 17 00:00:00 2001
From: e628 <a.matta@surrey.ac.uk>
Date: Mon, 24 Feb 2014 18:14:36 +0100
Subject: [PATCH] *e628 field change
---
Inputs/DetectorConfiguration/e628.detector | 16 ++++++++--------
NPAnalysis/MakePhysicalTree/Analysis.cxx | 14 --------------
NPAnalysis/MakePhysicalTree/RunToTreat.txt | 2 +-
NPAnalysis/must2/configs/ConfigMust2.dat | 5 -----
4 files changed, 9 insertions(+), 28 deletions(-)
diff --git a/Inputs/DetectorConfiguration/e628.detector b/Inputs/DetectorConfiguration/e628.detector
index dc070a5dd..aae591bee 100644
--- a/Inputs/DetectorConfiguration/e628.detector
+++ b/Inputs/DetectorConfiguration/e628.detector
@@ -2,16 +2,16 @@
CATSArray
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
CATSDetector
- X1_Y1= -34.36 -34.96 -962.5
- X28_Y1= 36.76 -34.96 -962.5
- X1_Y28= -34.36 36.16 -962.5
- X28_Y28= 36.76 36.16 -962.5
+ X1_Y1= -34.36 -34.96 -1193
+ X28_Y1= 36.76 -34.96 -1193
+ X1_Y28= -34.36 36.16 -1193
+ X28_Y28= 36.76 36.16 -1193
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%2
CATSDetector
- X1_Y1= 34.26 -35.46 -562.5
- X28_Y1= -36.86 -35.46 -562.5
- X1_Y28= 34.26 35.66 -562.5
- X28_Y28= -36.86 35.66 -562.5
+ X1_Y1= 34.26 -35.46 -684
+ X28_Y1= -36.86 -35.46 -684
+ X1_Y28= 34.26 35.66 -684
+ X28_Y28= -36.86 35.66 -684
%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/NPAnalysis/MakePhysicalTree/Analysis.cxx b/NPAnalysis/MakePhysicalTree/Analysis.cxx
index 47b3da4f6..12ee9b6fb 100644
--- a/NPAnalysis/MakePhysicalTree/Analysis.cxx
+++ b/NPAnalysis/MakePhysicalTree/Analysis.cxx
@@ -33,7 +33,6 @@ int main(int argc, char** argv)
// Get the formed Chained Tree and Treat it
TChain* Chain = RootInput:: getInstance() -> GetChain();
- TExogamPhysics *Exo = (TExogamPhysics*) myDetector -> GetDetector("EXOGAM") ;
// Get number of events to treat
cout << endl << "///////// Starting Analysis ///////// "<< endl;
@@ -66,19 +65,6 @@ int main(int argc, char** argv)
Put your code here
************************************************/
- for(int i=0; i<4; i++) EGammaDC[i]=0;
- for(int i=0; i<Exo->TotalEnergy_lab.size(); i++)
- {
- float mytheta=Exo->GetSegmentAnglePhi(Exo->CloverNumber[i], Exo->CristalNumber[i], Exo->SegmentNumber[i]);
- float myphi=Exo->GetSegmentAngleTheta(Exo->CloverNumber[i], Exo->CristalNumber[i], Exo->SegmentNumber[i]);
- //myv(Exo->TotalEnergy_lab[i]*sin(mytheta)*sin(myphi),Exo->TotalEnergy_lab[i]*sin(mytheta)*cos(myphi) , Exo->TotalEnergy_lab[i]*cos(mytheta),(Exo->TotalEnergy_lab)[i]);
- //cout<<Exo->TotalEnergy_lab[i]<<endl;
- EGammaDC[i]=Exo->TotalEnergy_lab[i]*(1-beta*cos(mytheta*TMath::DegToRad()))/sqrt(1-beta*beta);
- //TVector3 boost= imp4.BoostVector();
- //myv.Boost(-boost);
- //DopplerCorrectedEnergy.push_back(myv.T());
- //h_DopplerCorrectedEnergy->Fill(myv.T());
- }
RootOutput::getInstance()->GetTree()->Fill();
}
diff --git a/NPAnalysis/MakePhysicalTree/RunToTreat.txt b/NPAnalysis/MakePhysicalTree/RunToTreat.txt
index 7d6ccc63f..48c5db0fe 100644
--- a/NPAnalysis/MakePhysicalTree/RunToTreat.txt
+++ b/NPAnalysis/MakePhysicalTree/RunToTreat.txt
@@ -1,4 +1,4 @@
TTreeName
AutoTree
RootFileName
- /data/e628X/e628/acquisition/run_root/run_1070.root
+ /data/e628X/e628/acquisition/run_root/run_1115.root
diff --git a/NPAnalysis/must2/configs/ConfigMust2.dat b/NPAnalysis/must2/configs/ConfigMust2.dat
index 3d0c81d7d..1a473ca5b 100644
--- a/NPAnalysis/must2/configs/ConfigMust2.dat
+++ b/NPAnalysis/must2/configs/ConfigMust2.dat
@@ -1,8 +1,3 @@
ConfigMust2
MAX_STRIP_MULTIPLICITY 1
- SI_X_E_RAW_THRESHOLD 0
- SILI_E_RAW_THRESHOLD 0
- SILI_E_THRESHOLD 0
- DISABLE_CHANNEL MM4STRX3
- DISABLE_ALL MM1
--
GitLab