Commit 01d43230 authored by Adrien Matta's avatar Adrien Matta
Browse files

* Adding Minos position offset and rotation

parent 32ba5a25
......@@ -110,11 +110,12 @@ void TMinosPhysics::PreTreat() {
double z_mm = (T*m_TimeBin+cal->GetValue(cal_o,0))*cal->GetValue(cal_v,0);
z_mm += m_ZOffset;
TVector3 Pos=TVector3(x_mm+m_Position.X(),y_mm+m_Position.Y(),z_mm+m_Position.Z())
Pos.RotateZ(m_ZRotation);
// Calibrate the Pad:
X_Pad.push_back(x_mm);
Y_Pad.push_back(y_mm);
Z_Pad.push_back(z_mm);
X_Pad.push_back(Pos.X());
Y_Pad.push_back(Pos.Y());
Z_Pad.push_back(Pos.Z());
Ring_Pad.push_back(ring);
Q_Pad.push_back(Q);
T_Pad.push_back(T);
......@@ -225,7 +226,7 @@ void TMinosPhysics::ReadConfiguration(NPL::InputParser parser) {
if(NPOptionManager::getInstance()->GetVerboseLevel())
cout << "//// " << blocks.size() << " detector(s) found " << endl;
vector<string> token= {"XML","TimeBin","ShapingTime","Baseline","Sampling","ZOffset"};
vector<string> token= {"XML","TimeBin","ShapingTime","Baseline","Sampling","Position","ZRotation"};
for(unsigned int i = 0 ; i < blocks.size() ; i++){
......@@ -236,7 +237,8 @@ void TMinosPhysics::ReadConfiguration(NPL::InputParser parser) {
m_Sampling= blocks[i]->GetInt("Sampling");
m_Baseline= blocks[i]->GetInt("BaseLine");
m_utility.SetParameters(m_TimeBin,m_ShapingTime,m_Baseline,m_Sampling);
m_ZOffset = blocks[i]->GetDouble("ZOffset","mm");
m_Position = blocks[i]->GetTVector3("Position","mm");
m_ZRotation= blocks[i]->GetDouble("ZRotation","deg");
string xmlpath = blocks[i]->GetString("XML");
NPL::XmlParser xml;
xml.LoadFile(xmlpath);
......
......@@ -82,7 +82,8 @@ class TMinosPhysics : public TObject, public NPL::VDetector {
double m_ShapingTime;//!
double m_Baseline;//!
unsigned int m_Sampling;//!
double m_ZOffset;//!
TVector3 m_Position;//!
double m_ZRotation;//!
NPL::MinosUtility m_utility;//! // an utility to fit the pad signal
......
......@@ -7,7 +7,11 @@ Target
X= 0 mm
Y= 0 mm
Z= 0 mm
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
SAMURAIBDC 1
XML= db/SAMURAIBDC1.xml
SAMURAIBDC 2
XML= db/SAMURAIBDC2.xml
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
SAMURAIFDC2
XML= db/SAMURAIFDC2.xml
......@@ -20,6 +24,7 @@ SAMURAIHOD
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Minos
Position= 0 0 0 mm
ZRotation= 35 deg
TargetLength= 152.76 mm
TargetMaterial= LH2
CellMaterial= Mylar
......@@ -28,5 +33,4 @@ Minos
ShapingTime= 333.9 ns
BaseLine= 250
Sampling= 10
ZOffset= 0 mm
XML= db/MINOS.xml
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment