From 1b2b37cec649bf6939710177ffa96705fdef168e Mon Sep 17 00:00:00 2001
From: adrien-matta <a.matta@surrey.ac.uk>
Date: Wed, 10 Dec 2014 09:35:37 +0000
Subject: [PATCH] * Fixing bug in TParisPhysics - Method BuildPhysicalEvent
method without argument were declared but not defined
---
NPLib/Paris/TParisPhysics.cxx | 16 ++++++++--------
NPLib/Paris/TParisPhysics.h | 5 ++---
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/NPLib/Paris/TParisPhysics.cxx b/NPLib/Paris/TParisPhysics.cxx
index 78625989f..92bdb202c 100644
--- a/NPLib/Paris/TParisPhysics.cxx
+++ b/NPLib/Paris/TParisPhysics.cxx
@@ -54,15 +54,15 @@ TParisPhysics::~TParisPhysics(){
}
////////////////////////////////////////////////////////////////////////////////
-void TParisPhysics::BuildSimplePhysicalEvent(TParisData* Data){
- BuildPhysicalEvent(Data);
+void TParisPhysics::BuildSimplePhysicalEvent(){
+ BuildPhysicalEvent();
}
////////////////////////////////////////////////////////////////////////////////
-void TParisPhysics::BuildPhysicalEvent(TParisData* Data){
+void TParisPhysics::BuildPhysicalEvent(){
- int multLaBrE = Data->GetPARISLaBr3StageEMult();
- int multCsIE = Data->GetPARISCsIStageEMult();
+ int multLaBrE = m_EventData->GetPARISLaBr3StageEMult();
+ int multCsIE = m_EventData->GetPARISCsIStageEMult();
//cout << "multLaBr= " << multLaBrE << endl;
//cout << "multCsI= " << multCsIE << endl;
@@ -76,7 +76,7 @@ void TParisPhysics::BuildPhysicalEvent(TParisData* Data){
if(multLaBrE>=1){
//cout << "cava1b" <<endl;
- //cout << Data->GetPARISLaBr3StageEEnergy(0) <<endl;
+ //cout << m_EventData->GetPARISLaBr3StageEEnergy(0) <<endl;
//cout << "cava1b" <<endl;
double EnergyStripFront;
@@ -84,7 +84,7 @@ void TParisPhysics::BuildPhysicalEvent(TParisData* Data){
for(int j=0;j<multLaBrE;j++)
{
- EnergyStripFront= Data->GetPARISLaBr3StageEEnergy(j);
+ EnergyStripFront= m_EventData->GetPARISLaBr3StageEEnergy(j);
EnergyStrip = EnergyStripFront;
ParisLaBr_E.push_back(EnergyStrip);
@@ -102,7 +102,7 @@ void TParisPhysics::BuildPhysicalEvent(TParisData* Data){
double EnergyTotSecond;
for(int j=0;j<multCsIE;j++)
{
- EnergySecond = Data->GetPARISCsIStageEEnergy(j);
+ EnergySecond = m_EventData->GetPARISCsIStageEEnergy(j);
ParisCsI_E.push_back(EnergySecond);
EnergyTotSecond +=EnergySecond;
diff --git a/NPLib/Paris/TParisPhysics.h b/NPLib/Paris/TParisPhysics.h
index 9b2062540..c43841ba8 100644
--- a/NPLib/Paris/TParisPhysics.h
+++ b/NPLib/Paris/TParisPhysics.h
@@ -26,6 +26,7 @@
// STD
#include <vector>
#include <cstdlib>
+using namespace std ;
// NPL
#include "../include/VDetector.h"
@@ -34,7 +35,7 @@
// Root
#include "TObject.h"
#include "TVector3.h"
-using namespace std ;
+
class TParisPhysics : public TObject, public NPA::VDetector{
public:
@@ -44,8 +45,6 @@ class TParisPhysics : public TObject, public NPA::VDetector{
public:
void Clear();
void Clear(const Option_t*) {};
- void BuildPhysicalEvent(TParisData* Data);
- void BuildSimplePhysicalEvent(TParisData* Data);
public:
/////////////////////////////////////
--
GitLab