+ Minor updates

Inputs/DetectorConfiguration/SPcoincW1.detector

@@ -8,6 +8,10 @@ Target
    X= 0
    Y= 0
    Z= 0
+
+
+
+
 %%%%%%% Detector 1 %%%%%%%			
 W1
 	THETA= 150
@@ -52,6 +56,8 @@ W1
 	VIS= all					
 
 
-
 %%%%%%% Splitpole  %%%%%%%
 SplitPole
+
+
+

Inputs/DetectorConfiguration/W1.detector

@@ -8,6 +8,11 @@ Target
    X= 0
    Y= 0
    Z= 0
+
+
+
+
+
 %%%%%%% Detector 1 %%%%%%%			
 W1
 	THETA= 150
@@ -15,3 +20,40 @@ W1
 	R= 150
 	BETA= 0 0 0
 	VIS= all					
+%%%%%%% Detector 2 %%%%%%%			
+W1
+	THETA= 150
+	PHI= 0
+	R= 150
+	BETA= 0 0 0
+	VIS= all					
+%%%%%%% Detector 3 %%%%%%%			
+W1
+	THETA= 150
+	PHI= 0
+	R= 150
+	BETA= 0 0 0
+	VIS= all					
+%%%%%%% Detector 4 %%%%%%%			
+W1
+	THETA= 150
+	PHI= 0
+	R= 150
+	BETA= 0 0 0
+	VIS= all					
+%%%%%%% Detector 5 %%%%%%%			
+W1
+	THETA= 150
+	PHI= 0
+	R= 150
+	BETA= 0 0 0
+	VIS= all					
+%%%%%%% Detector 6 %%%%%%%			
+W1
+	THETA= 150
+	PHI= 0
+	R= 150
+	BETA= 0 0 0
+	VIS= all					
+
+

NPAnalysis/SPcoincW1/Analysis.cxx

@@ -49,7 +49,7 @@ Analysis::~Analysis()
 ////////////////////////////////////////////////////////////////////////////////
 void Analysis::Init()
 {
-//   m_W1 = (TW1Physics*)        m_DetectorManager->GetDetector("W1");
+   m_W1 = (TW1Physics*)        m_DetectorManager->GetDetector("W1");
    m_SP = (TSplitPolePhysics*) m_DetectorManager->GetDetector("SplitPole");
 }
 
@@ -58,7 +58,6 @@ void Analysis::Init()
 ////////////////////////////////////////////////////////////////////////////////
 void Analysis::TreatEvent()
 {
-//   cout << "pipo" << endl;
 }
 
 

NPAnalysis/SPcoincW1/RunToTreat.txt

@@ -2,5 +2,7 @@ TTreeName
   EGTree
 RootFileName
 %  /scratch/gypaos/data/al27pp/oct2015/midas/root/R25_0_new.root
-  /scratch/gypaos/data/al27pp/oct2015/midas/root/R131_0.root
+%  /scratch/gypaos/data/al27pp/oct2015/midas/root/R50_0_W1only.root
+%  /scratch/gypaos/data/al27pp/oct2015/midas/root/R50_0_SPonly.root
+  /scratch/gypaos/data/al27pp/oct2015/midas/root/R50_0.root
 

NPLib/SplitPole/TSplitPolePhysics.cxx

@@ -137,7 +137,6 @@ void  TSplitPolePhysics::InitializeRootInputRaw()
    TChain* inputChain = RootInput::getInstance()->GetChain();
    inputChain->SetBranchStatus("SplitPole",  true);
    inputChain->SetBranchStatus("fPosition",  true);
-   inputChain->SetBranchStatus("fBrho",      true);
    inputChain->SetBranchStatus("fDeltaE",    true);
    inputChain->SetBranchStatus("fWire",      true);
    inputChain->SetBranchStatus("fPlasticP",  true);

NPLib/SplitPole/TSplitPolePhysics.h

@@ -108,10 +108,10 @@ class TSplitPolePhysics : public TObject, public NPL::VDetector
       void ClearEventPhysics()   {Clear();}
       void ClearEventData()      {m_EventData->Clear();}
 
-      // Methods related to the TW1Spectra classes
-      // Instantiate the TW1Spectra class and the histograms
+      // Methods related to the TSplitPoleSpectra classes
+      // Instantiate the TSplitPoleSpectra class and the histograms
       void InitSpectra();
-      // Fill the spectra defined in TW1Spectra
+      // Fill the spectra defined in TSplitPoleSpectra
       void FillSpectra();
       // Used for Online mainly, perform check on the histo and for example change their color if issues are found
       void CheckSpectra();
@@ -139,7 +139,7 @@ class TSplitPolePhysics : public TObject, public NPL::VDetector
       // Read the user configuration file; if no file found, load standard one
       void ReadAnalysisConfig();
 
-      // Give an external TW1Data object to TW1Physics. Needed for online analysis for example.
+      // Give an external TSplitPoleData object to TSplitPolePhysics. Needed for online analysis for example.
       void SetRawDataPointer(TSplitPoleData* rawDataPointer) {m_EventData = rawDataPointer;}
 
 

NPLib/SplitPole/TSplitPoleSpectra.cxx

@@ -36,9 +36,9 @@ using namespace std;
 TSplitPoleSpectra::TSplitPoleSpectra()
 {
    if (NPOptionManager::getInstance()->GetVerboseLevel() > 0)
-      cout << "******************************************************" << endl
-           << "TSplitPoleSpectra : Initalising control spectra " 
-           << "******************************************************" << endl ;
+      cout << "*********************************************************" << endl
+           << "TSplitPoleSpectra : Initializing control spectra         " << endl 
+           << "*********************************************************" << endl;
    SetName("SplitPole");
 
    InitRawSpectra();

NPLib/W1/TW1Physics.cxx

@@ -67,11 +67,11 @@ TW1Physics::TW1Physics()
 
 
 ///////////////////////////////////////////////////////////////////////////
-TW1Physics::~TW1Physics()
-{
-   delete m_EventData;
-   delete m_PreTreatedData;
-}
+//TW1Physics::~TW1Physics()
+//{
+//   delete m_EventData;
+//   delete m_PreTreatedData;
+//}
 
 
 

NPLib/W1/TW1Physics.h

@@ -48,7 +48,7 @@ class TW1Physics : public TObject, public NPL::VDetector
 {
  public:   //   Constructor and Destructor
    TW1Physics();
-   ~TW1Physics();
+   ~TW1Physics() {};
 
  public:
    void Clear();

NPLib/W1/TW1Spectra.cxx

@@ -47,10 +47,10 @@ TW1Spectra::TW1Spectra()
 TW1Spectra::TW1Spectra(unsigned int NumberOfDetectors)
 {
    if (NPOptionManager::getInstance()->GetVerboseLevel() > 0)
-      cout << "******************************************************" << endl
-           << "TW1Spectra : Initalising control spectra for " 
-           << NumberOfDetectors << " Detectors" << endl
-           << "******************************************************" << endl ;
+      cout << "*********************************************************" << endl
+           << "TW1Spectra : Initializing control spectra for " 
+           << NumberOfDetectors << " detectors" << endl
+           << "*********************************************************" << endl ;
    SetName("W1");
    fNumberOfDetectors = NumberOfDetectors;
    fNumberOfStripsFront = 16;