diff --git a/Inputs/DetectorConfiguration/Riken_65mm.detector b/Inputs/DetectorConfiguration/Riken_65mm.detector index bfd2434e8dcd00f542919d78dbd698ebb13e607b..4b8151dd70c82289d48ccf93258d020fda2bcd65 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 de05eaf790282a3502cb23d9630fecbc78d05d64..be7f2979ca63d37e1c649a921259625450c56755 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 087aecf1b585fd949bee61877db0eab779ede5ef..d582a5424280889416b5ee0bc67377183c9b5ba0 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 da0328ec0d6573b3a31863c47ba0adbf918b0f61..2d897e630399cbd1a9fbec0f7aec827780c4dc72 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 9c12bc02eb1ff80120b7ccab2eef2f2f7ed79219..cff1647f8d797ce9ae8dd6e4ba93c1b6d055636e 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.