From dbec4a2fe12fa1e1b614eefb97013a23ed4b956c Mon Sep 17 00:00:00 2001
From: Ryan Wilkinson <r.wilkinson@surrey.ac.uk>
Date: Mon, 13 Apr 2015 16:25:26 +0100
Subject: [PATCH] * Fixing issue with loading of libNPAnalysis on linux *
fixing issues with token for tiara
---
NPAnalysis/newTAMU/Analysis.cxx | 4 ++--
NPLib/Core/NPDetectorManager.cxx | 2 ++
NPLib/Tiara/TTiaraBarrelPhysics.cxx | 4 ++--
NPLib/Tiara/TTiaraHyballPhysics.cxx | 4 ++--
NPLib/Utility/npanalysis.cxx | 2 +-
5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/NPAnalysis/newTAMU/Analysis.cxx b/NPAnalysis/newTAMU/Analysis.cxx
index 276bafb7c..4a856cb02 100644
--- a/NPAnalysis/newTAMU/Analysis.cxx
+++ b/NPAnalysis/newTAMU/Analysis.cxx
@@ -36,8 +36,8 @@ Analysis::~Analysis(){
////////////////////////////////////////////////////////////////////////////////
void Analysis::Init(){
- TH = (TTiaraHyballPhysics*) m_DetectorManager -> GetDetector("TiaraHyball");
- TB = (TTiaraBarrelPhysics*) m_DetectorManager -> GetDetector("TiaraBarrel");
+ TH = (TTiaraHyballPhysics*) m_DetectorManager -> GetDetector("TiaraHyballWedge");
+ TB = (TTiaraBarrelPhysics*) m_DetectorManager -> GetDetector("TiaraInnerBarrel=");
proton_CD2 = EnergyLoss("proton_CD2.G4table","G4Table",100 );
proton_Al = EnergyLoss("proton_Al.G4table","G4Table",10);
proton_Si = EnergyLoss("proton_Si.G4table","G4Table",10);
diff --git a/NPLib/Core/NPDetectorManager.cxx b/NPLib/Core/NPDetectorManager.cxx
index 14235520e..a56e2ca53 100644
--- a/NPLib/Core/NPDetectorManager.cxx
+++ b/NPLib/Core/NPDetectorManager.cxx
@@ -307,6 +307,8 @@ this_thread::sleep_for(chrono::milliseconds(100));
}
m_Ready[id]=false;
}
+ else
+ this_thread::yield();
}
}
////////////////////////////////////////////////////////////////////////////////
diff --git a/NPLib/Tiara/TTiaraBarrelPhysics.cxx b/NPLib/Tiara/TTiaraBarrelPhysics.cxx
index 1f5447921..2c06f20a9 100644
--- a/NPLib/Tiara/TTiaraBarrelPhysics.cxx
+++ b/NPLib/Tiara/TTiaraBarrelPhysics.cxx
@@ -704,8 +704,8 @@ void TTiaraBarrelPhysics::BuildPhysicalEvent(){
class brlproxy{
public:
brlproxy(){
- NPA::DetectorFactory::getInstance()->AddToken("TiaraInnerBarrel","Tiara");
- NPA::DetectorFactory::getInstance()->AddDetector("TiaraInnerBarrel",TTiaraBarrelPhysics::Construct);
+ NPA::DetectorFactory::getInstance()->AddToken("TiaraInnerBarrel=","Tiara");
+ NPA::DetectorFactory::getInstance()->AddDetector("TiaraInnerBarrel=",TTiaraBarrelPhysics::Construct);
}
};
diff --git a/NPLib/Tiara/TTiaraHyballPhysics.cxx b/NPLib/Tiara/TTiaraHyballPhysics.cxx
index c8d1de8aa..55a620cc3 100644
--- a/NPLib/Tiara/TTiaraHyballPhysics.cxx
+++ b/NPLib/Tiara/TTiaraHyballPhysics.cxx
@@ -786,8 +786,8 @@ extern "C"{
class proxy{
public:
proxy(){
- NPA::DetectorFactory::getInstance()->AddToken("TiaraHyball","Tiara");
- NPA::DetectorFactory::getInstance()->AddDetector("TiaraHyball",TTiaraHyballPhysics::Construct);
+ NPA::DetectorFactory::getInstance()->AddToken("TiaraHyballWedge","Tiara");
+ NPA::DetectorFactory::getInstance()->AddDetector("TiaraHyballWedge",TTiaraHyballPhysics::Construct);
}
};
diff --git a/NPLib/Utility/npanalysis.cxx b/NPLib/Utility/npanalysis.cxx
index 21827565c..bdd27c190 100644
--- a/NPLib/Utility/npanalysis.cxx
+++ b/NPLib/Utility/npanalysis.cxx
@@ -61,7 +61,7 @@ int main(int argc , char** argv){
// Attempt to load an analysis
NPA::VAnalysis* UserAnalysis = NULL;
- string libName = "libNPAnalysis" + SHARED_LIB_EXTENSION;
+ string libName = "./libNPAnalysis" + SHARED_LIB_EXTENSION;
dlopen(libName.c_str(),RTLD_NOW);
char* error = dlerror();
if(error==NULL){
--
GitLab