From 7bc4a8b559670989c03ee40e5fad34f5f413ddf7 Mon Sep 17 00:00:00 2001
From: matta <matta@npt>
Date: Mon, 7 Feb 2011 22:01:42 +0000
Subject: [PATCH] * Fixing minor bug to run 10He Analysis * Adding line for
avoiding warning when compiling NPS
---
Inputs/DetectorConfiguration/Riken_65mm.detector | 4 ++--
NPAnalysis/10He_Riken/configs/ConfigMust2.dat | 6 +++---
NPAnalysis/10He_Riken/src/Analysis.cc | 2 +-
NPSimulation/src/Chamber.cc | 3 ++-
NPSimulation/src/ThinSi.cc | 2 +-
5 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/Inputs/DetectorConfiguration/Riken_65mm.detector b/Inputs/DetectorConfiguration/Riken_65mm.detector
index bfd2434e8..4b8151dd7 100644
--- a/Inputs/DetectorConfiguration/Riken_65mm.detector
+++ b/Inputs/DetectorConfiguration/Riken_65mm.detector
@@ -11,7 +11,7 @@ Target
THICKNESS= 0.001
RADIUS= 45
MATERIAL= CD2
- ANGLE= 45
+ ANGLE= 0
X= 0
Y= 0
Z= 0
@@ -128,7 +128,7 @@ VIS= all
%%%%%%%%%%%%%%%%%%%%%
-AddThinSi
+%AddThinSi
%%%%%%%%%% Det 1 %%%%%%%%
ThinSi
A= 17.61 9.85 104.11
diff --git a/NPAnalysis/10He_Riken/configs/ConfigMust2.dat b/NPAnalysis/10He_Riken/configs/ConfigMust2.dat
index de05eaf79..be7f2979c 100644
--- a/NPAnalysis/10He_Riken/configs/ConfigMust2.dat
+++ b/NPAnalysis/10He_Riken/configs/ConfigMust2.dat
@@ -1,4 +1,4 @@
ConfigMust2
- MAX_STRIP_MULTIPLICITY 1
- STRIP_ENERGY_MATCHING_TOLERANCE 10
- MUST2 DISABLE_ALL MM4
+ MAX_STRIP_MULTIPLICITY 2
+ SI_X_E_RAW_THRESHOLD 0
+
diff --git a/NPAnalysis/10He_Riken/src/Analysis.cc b/NPAnalysis/10He_Riken/src/Analysis.cc
index 087aecf1b..d582a5424 100644
--- a/NPAnalysis/10He_Riken/src/Analysis.cc
+++ b/NPAnalysis/10He_Riken/src/Analysis.cc
@@ -21,7 +21,7 @@ int main(int argc,char** argv)
}
// Instantiate RootOutput
- RootOutput::getInstance("Analysis/Paris_AnalyzedData", "AnalysedTree");
+ RootOutput::getInstance("Analysis/10_AnalyzedData", "AnalysedTree");
// get input files from NPOptionManager
string reactionfileName = myOptionManager->GetReactionFile();
diff --git a/NPSimulation/src/Chamber.cc b/NPSimulation/src/Chamber.cc
index da0328ec0..2d897e630 100644
--- a/NPSimulation/src/Chamber.cc
+++ b/NPSimulation/src/Chamber.cc
@@ -63,7 +63,8 @@ Chamber::Chamber()
G4Material* Chamber::GetMaterialFromLibrary(G4String MaterialName, G4double Temperature, G4double Pressure)
{
-
+ Temperature = 0 ;
+ Pressure = 0 ;
G4Material* myMaterial;
diff --git a/NPSimulation/src/ThinSi.cc b/NPSimulation/src/ThinSi.cc
index 9c12bc02e..cff1647f8 100644
--- a/NPSimulation/src/ThinSi.cc
+++ b/NPSimulation/src/ThinSi.cc
@@ -554,7 +554,7 @@ void ThinSi::InitializeRootOutput()
{
RootOutput *pAnalysis = RootOutput::getInstance();
TTree *pTree = pAnalysis->GetTree();
- pTree->Branch("ThinSi", "TSSSDData", &m_Event) ;
+ pTree->Branch("SSSD", "TSSSDData", &m_Event) ;
}
// Read sensitive part and fill the Root tree.
--
GitLab