Merge branch 'NPTool.2.dev' of https://gitlab.in2p3.fr/np/nptool into NPTool.2.dev

NPLib/Detectors/Vendeta/TVendetaPhysics.cxx

@@ -52,7 +52,7 @@ TVendetaPhysics::TVendetaPhysics()
      m_E_Threshold(0),     // MeV
      m_AnodeNumber(-1),
      m_NumberOfDetectors(0) {
-}
+     }
 
 ///////////////////////////////////////////////////////////////////////////
 /// A usefull method to bundle all operation to add a detector

Projects/Vendeta/Analysis.cxx

@@ -25,6 +25,7 @@ using namespace std;
 #include"NPAnalysisFactory.h"
 #include"NPDetectorManager.h"
 #include"NPOptionManager.h"
+#include"RootInput.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 Analysis::Analysis(){
@@ -35,11 +36,11 @@ Analysis::~Analysis(){
 
 ////////////////////////////////////////////////////////////////////////////////
 void Analysis::Init(){
+  InitOutputBranch();
+
   Vendeta= (TVendetaPhysics*) m_DetectorManager->GetDetector("Vendeta");
   FC= (TFissionChamberPhysics*) m_DetectorManager->GetDetector("FissionChamber");
 
-  InitOutputBranch();
-
   neutron = new NPL::Particle("1n");
 }
 
@@ -54,6 +55,7 @@ void Analysis::TreatEvent(){
 
     Vendeta->SetAnodeNumber(anode);
     Vendeta->BuildPhysicalEvent();
+
     unsigned int Vendeta_mult = Vendeta->DetectorNumber.size();
     for(unsigned int i=0; i<Vendeta_mult; i++){
       int DetNbr          = Vendeta->DetectorNumber[i];

Projects/Vendeta/Analysis.h

@@ -36,6 +36,7 @@ class Analysis: public NPL::VAnalysis{
     void Init();
     void TreatEvent();
     void End();
+    void InitInputBranch();
     void InitOutputBranch();
     void ReInitValue();
 

Projects/Vendeta/Vendeta_full.detector

 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 Alias Theta
  Action= Copy
- Value= 25 36.8 46.6 60.5 72.3 84.1 95.9 107.7 119.6 131.4 143.2 155 
+ Value= 25 36.8 48.6 60.5 72.3 84.1 95.9 107.7 119.6 131.4 143.2 155 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 Alias Phi
  Action= Copy