From 50b5150613bd4e33e8d48b461b736e79c30ee0a8 Mon Sep 17 00:00:00 2001
From: matta <matta@npt>
Date: Wed, 9 Feb 2011 18:28:42 +0000
Subject: [PATCH] * Update NPD
---
Inputs/EventGenerator/60Fe.reaction | 2 +-
NPAnalysis/must2/configs/ConfigMust2.dat | 4 ++-
NPDocumentation/NPTool_UserGuide.tex | 31 ++++++++++++++++++++++++
NPLib/MUST2/TMust2Physics.cxx | 2 --
4 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/Inputs/EventGenerator/60Fe.reaction b/Inputs/EventGenerator/60Fe.reaction
index 92f87dfaa..e15f59d70 100644
--- a/Inputs/EventGenerator/60Fe.reaction
+++ b/Inputs/EventGenerator/60Fe.reaction
@@ -17,6 +17,6 @@ Transfert
SigmaPhiY= 0
CrossSectionPath= fe61_p3_2gs.n
ShootLight= 1
- ShootHeavy= 0
+ ShootHeavy= 1
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/NPAnalysis/must2/configs/ConfigMust2.dat b/NPAnalysis/must2/configs/ConfigMust2.dat
index 2e760ba65..3d0c81d7d 100644
--- a/NPAnalysis/must2/configs/ConfigMust2.dat
+++ b/NPAnalysis/must2/configs/ConfigMust2.dat
@@ -3,4 +3,6 @@ ConfigMust2
SI_X_E_RAW_THRESHOLD 0
SILI_E_RAW_THRESHOLD 0
SILI_E_THRESHOLD 0
-
+ DISABLE_CHANNEL MM4STRX3
+ DISABLE_ALL MM1
+
diff --git a/NPDocumentation/NPTool_UserGuide.tex b/NPDocumentation/NPTool_UserGuide.tex
index 051e8624d..05edcecc6 100644
--- a/NPDocumentation/NPTool_UserGuide.tex
+++ b/NPDocumentation/NPTool_UserGuide.tex
@@ -354,5 +354,36 @@ If not they will remain empty.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\chapter[NPAnalysis]{NPAnalysis}
+ \section{Token used in the config file}
+ \subsection{Must2}
+
+ \textbf{File name :} ConfigMust2.dat \\
+ \textbf{Main Token :} ConfigMust2
+ \begin{description}
+ \item[MAX\_STRIP\_MULTIPLICITY:] Maximum multiplicity to treat an event.
+ \item[STRIP\_ENERGY\_MATCHING\_SIGMA:] Sigma of Energy for Silicium stage
+ \item[STRIP\_ENERGY\_MATCHING\_NUMBER\_OF\_SIGMA:] Number of sigma allowed in difference beetween X and Y
+ \item[DISABLE\_CHANNEL MMzSTRXt:] Disable Strip X number t of detector z
+ \item[DISABLE\_CHANNEL MMzSTRYt:] Disable Strip Y number t of detector z
+ \item[DISABLE\_CHANNEL MMzSILIt:] Disable SiLi number t of detector z
+ \item[DISABLE\_CHANNEL MMzCSIt:] Disable CsI number t of detector z
+ \item[TAKE\_E\_Y:] Take Energy Y
+ \item[TAKE\_T\_Y:] Take Time Y
+ \item[TAKE\_E\_X:] Take Energy X
+ \item[TAKE\_T\_X:] Take Time Xs
+ \item[IGNORE\_NOT\_MATCHING\_CSI:] Ignore event that does not occure in front of a CsI cristal
+ \item[CSI\_SIZE:] size in strip of a CsI cristal
+ \item[IGNORE\_NOT\_MATCHING\_SILI:] Ignore event that does not occure in front of a SiLi pad
+ \item[SILI\_SIZE:] size in strip of a SiLi pad
+ \item[SI\_X\_E\_RAW\_THRESHOLD:] Threshold in channel for Strip X (set to 0 for simulation)
+ \item[SI\_Y\_E\_RAW\_THRESHOLD:] Threshold in channel for Strip Y
+ \item[SILI\_E\_RAW\_THRESHOLD:] Threshold in channel for SiLi (set to 0 for simulation)
+ \item[CSI\_E\_RAW\_THRESHOLD:] Threshold in channel for CsI (set to 0 for simulation)
+ \item[SI\_X\_E\_THRESHOLD:] Threshold in energy for Strip X
+ \item[SI\_Y\_E\_THRESHOLD:] Threshold in energy for Strip Y
+ \item[SILI\_E\_THRESHOLD:] Threshold in energy for SiLi
+ \item[CSI\_E\_THRESHOLD:] Threshold in energy for CsI
+ \end{description}
+
\end{document}
diff --git a/NPLib/MUST2/TMust2Physics.cxx b/NPLib/MUST2/TMust2Physics.cxx
index cd4ad87f3..a79d166b8 100644
--- a/NPLib/MUST2/TMust2Physics.cxx
+++ b/NPLib/MUST2/TMust2Physics.cxx
@@ -578,14 +578,12 @@ void TMust2Physics::ReadAnalysisConfig()
AnalysisConfigFile.ignore(numeric_limits<streamsize>::max(), '\n' );
}
-// else if (whatToDo.compare(0, 22, "MAX_STRIP_MULTIPLICITY") == 0) {
else if (whatToDo=="MAX_STRIP_MULTIPLICITY") {
AnalysisConfigFile >> DataBuffer;
m_MaximumStripMultiplicityAllowed = atoi(DataBuffer.c_str() );
cout << "MAXIMUN STRIP MULTIPLICITY " << m_MaximumStripMultiplicityAllowed << endl;
}
-// else if (whatToDo.compare(0, 27, "STRIP_ENERGY_MATCHING_SIGMA") == 0) {
else if (whatToDo=="STRIP_ENERGY_MATCHING_SIGMA") {
AnalysisConfigFile >> DataBuffer;
m_StripEnergyMatchingSigma = atof(DataBuffer.c_str() );
--
GitLab