Skip to content
Snippets Groups Projects
Commit d142c83e authored by Leszek Adamczyk's avatar Leszek Adamczyk Committed by Graeme Stewart
Browse files

AFP_LocReco-00-00-09AFP_LocReco-00-00-09: use xAOD as input and ERROR, FATAL... 

AFP_LocReco-00-00-09AFP_LocReco-00-00-09: use xAOD as input and ERROR, FATAL --> WARNING; add AFP_EventTPCnv in requirements (AFP_LocReco-00-00-09)

                    * fix in AFP_SIDBasicKalman::FilterTrkCollection() (causing timeout error)
parent 9fa8c35e
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1443 additions and 1268 deletions
ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/AFP_LocReco/AFP_SIDBasicKalman.h
+ 2
− 2
View file @ d142c83e
......@@ -28,8 +28,8 @@
#define SIDSTATIONID 4
#define MAXCHI2HIT 2.0
#define MAXCHI2TRK 2.0
#define MAXCHI2HIT 3.0
#define MAXCHI2TRK 3.0
#define MAXSHAREDHITS 2
using namespace std;
......
ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/AFP_LocReco/AFP_SIDLocReco.h
+ 124
− 122
View file @ d142c83e
......@@ -2,125 +2,127 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
#ifndef AFP_SIDLOCRECO_h
#define AFP_SIDLOCRECO_h
#include <iostream>
#include <string>
#include <list>
#include <map>
#include <vector>
#include <fstream>
//#include "GaudiKernel/Algorithm.h"
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/ObjectVector.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/IToolSvc.h"
#include "AthenaKernel/getMessageSvc.h"
#include "AthenaKernel/IAtRndmGenSvc.h"
#include "StoreGate/StoreGateSvc.h"
#include "StoreGate/DataHandle.h"
#include "EventInfo/EventInfo.h"
#include "EventInfo/EventID.h"
#include "AthenaPoolUtilities/AthenaAttributeList.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
//#include "AFP_RawEv/AFP_RawData.h"
//#include "AFP_RawEv/AFP_RawDataContainer.h"
//#include "AFP_RawEv/AFP_RawDataCollection.h"
//#include "AFP_RawEv/AFP_SIDDigitCollection.h"
//#include "AFP_RawEv/AFP_TDDigitCollection.h"
#include "AFP_Geometry/AFP_constants.h"
#include "AFP_Geometry/AFP_Geometry.h"
#include "AFP_Geometry/AFP_ConfigParams.h"
#include "CLHEP/Geometry/Point3D.h"
#include "AFP_DigiEv/AFP_SiDigiCollection.h"
#include "AFP_LocRecoEv/AFP_SIDLocRecoEvCollection.h"
//#include "AFP_LocRecoEv/AFP_SIDLocRecoEvCollection.h"
#include "AFP_LocReco/AFP_UserObjects.h"
#include "AFP_LocReco/AFP_SIDBasicKalman.h"
#include "TROOT.h"
//for truth particles
#include "GeneratorObjects/McEventCollection.h"
#include "HepMC/GenEvent.h"
#include "HepMC/GenVertex.h"
#include "HepMC/GenParticle.h"
using namespace std;
#define SIDSTATIONID 4
class StoreGateSvc;
class ActiveStoreSvc;
class AFP_SIDLocReco : public AthAlgorithm
{
public:
AFP_SIDLocReco(const string& name, ISvcLocator* pSvcLocator);
~AFP_SIDLocReco();
private:
AFP_CONFIGURATION m_Config;
AFP_Geometry* m_pGeometry;
// a handle on Store Gate
StoreGateSvc* m_storeGate;
//StoreGateSvc* m_pDetStore;
AFP_SIDLocRecoEvCollection* m_pSIDLocRecoEvCollection;
AFP_SIDLocRecoEvent* m_pSIDLocRecoEvent;
private:
UInt_t m_eventNum; //real event number
Int_t m_iRunNum;
Int_t m_iDataType; //data type (simulation or real data) using in the local reconstruction
Int_t m_iEvent; //event number from zero value
Float_t m_AmpThresh; // TD signal amplitude threshold
//slope and X,Y,Z-pos for SID plates [4][6]
Float_t m_fsSID[SIDSTATIONID][SIDCNT];
Float_t m_fxSID[SIDSTATIONID][SIDCNT];
Float_t m_fySID[SIDSTATIONID][SIDCNT];
Float_t m_fzSID[SIDSTATIONID][SIDCNT];
string m_strKeyGeometryForReco;
vector<string> m_vecListAlgoSID;
string m_strAlgoSID;
string m_strKeySIDLocRecoEvCollection;
string m_strSIDCollectionName;
public:
StatusCode initialize();
StatusCode execute();
StatusCode finalize();
private:
bool ReadGeometryDetCS();
bool StoreReconstructionGeometry(/*const char* szDataDestination*/);
void SaveGeometry();
void ClearGeometry();
StatusCode AFPCollectionReading(list<SIDHIT> &ListSIDHits);
StatusCode RecordSIDCollection();
StatusCode ExecuteRecoMethod(const string strAlgo, const list<SIDHIT> &ListSIDHits);
};
#endif //AFP_TDLOCRECO_h
#ifndef AFP_SIDLOCRECO_h
#define AFP_SIDLOCRECO_h
#include <iostream>
#include <string>
#include <list>
#include <map>
#include <vector>
#include <fstream>
//#include "GaudiKernel/Algorithm.h"
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/ObjectVector.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/IToolSvc.h"
#include "AthenaKernel/getMessageSvc.h"
#include "AthenaKernel/IAtRndmGenSvc.h"
#include "StoreGate/StoreGateSvc.h"
#include "StoreGate/DataHandle.h"
#include "EventInfo/EventInfo.h"
#include "EventInfo/EventID.h"
#include "AthenaPoolUtilities/AthenaAttributeList.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
//#include "AFP_RawEv/AFP_RawData.h"
//#include "AFP_RawEv/AFP_RawDataContainer.h"
//#include "AFP_RawEv/AFP_RawDataCollection.h"
//#include "AFP_RawEv/AFP_SIDDigitCollection.h"
//#include "AFP_RawEv/AFP_TDDigitCollection.h"
#include "AFP_Geometry/AFP_constants.h"
#include "AFP_Geometry/AFP_Geometry.h"
#include "AFP_Geometry/AFP_ConfigParams.h"
#include "CLHEP/Geometry/Point3D.h"
#include "AFP_DigiEv/AFP_SiDigiCollection.h"
#include "AFP_LocRecoEv/AFP_SIDLocRecoEvCollection.h"
//#include "AFP_LocRecoEv/AFP_SIDLocRecoEvCollection.h"
#include "AFP_LocReco/AFP_UserObjects.h"
#include "AFP_LocReco/AFP_SIDBasicKalman.h"
#include "TROOT.h"
//for truth particles
#include "GeneratorObjects/McEventCollection.h"
#include "HepMC/GenEvent.h"
#include "HepMC/GenVertex.h"
#include "HepMC/GenParticle.h"
// xAOD
#include "xAODForward/AFPTrackContainer.h"
using namespace std;
#define SIDSTATIONID 4
class StoreGateSvc;
class ActiveStoreSvc;
class AFP_SIDLocReco : public AthAlgorithm
{
public:
AFP_SIDLocReco(const string& name, ISvcLocator* pSvcLocator);
~AFP_SIDLocReco();
private:
AFP_CONFIGURATION m_Config;
AFP_Geometry* m_pGeometry;
// a handle on Store Gate
StoreGateSvc* m_storeGate;
//StoreGateSvc* m_pDetStore;
AFP_SIDLocRecoEvCollection* m_pSIDLocRecoEvCollection;
AFP_SIDLocRecoEvent* m_pSIDLocRecoEvent;
private:
UInt_t m_eventNum; //real event number
Int_t m_iRunNum;
Int_t m_iDataType; //data type (simulation or real data) using in the local reconstruction
Int_t m_iEvent; //event number from zero value
Float_t m_AmpThresh; // TD signal amplitude threshold
//slope and X,Y,Z-pos for SID plates [4][6]
Float_t m_fsSID[SIDSTATIONID][SIDCNT];
Float_t m_fxSID[SIDSTATIONID][SIDCNT];
Float_t m_fySID[SIDSTATIONID][SIDCNT];
Float_t m_fzSID[SIDSTATIONID][SIDCNT];
string m_strKeyGeometryForReco;
vector<string> m_vecListAlgoSID;
string m_strAlgoSID;
string m_strKeySIDLocRecoEvCollection;
string m_strSIDCollectionName;
public:
StatusCode initialize();
StatusCode execute();
StatusCode finalize();
private:
bool ReadGeometryDetCS();
bool StoreReconstructionGeometry(/*const char* szDataDestination*/);
void SaveGeometry();
void ClearGeometry();
StatusCode AFPCollectionReading(list<SIDHIT> &ListSIDHits);
StatusCode RecordSIDCollection();
StatusCode ExecuteRecoMethod(const string strAlgo, const list<SIDHIT> &ListSIDHits, xAOD::AFPTrackContainer* resultContainer);
};
#endif //AFP_TDLOCRECO_h
ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/CMakeLists.txt
+ 5
− 2
View file @ d142c83e
......@@ -16,7 +16,10 @@ atlas_depends_on_subdirs( PUBLIC
ForwardDetectors/AFP/AFP_Geometry
ForwardDetectors/AFP/AFP_RecoEv/AFP_LocRecoEv
GaudiKernel
Generators/GeneratorObjects )
Generators/GeneratorObjects
Event/xAOD/xAODForward
PRIVATE
Control/AthLinks)
# External dependencies:
find_package( CLHEP )
......@@ -32,7 +35,7 @@ atlas_add_component( AFP_LocReco
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps AthenaKernel StoreGateLib SGtests AthenaPoolUtilities EventInfo AFP_DigiEv AFP_Geometry AFP_LocRecoEv GaudiKernel GeneratorObjects )
LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps AthenaKernel StoreGateLib SGtests AthenaPoolUtilities EventInfo AFP_DigiEv AFP_Geometry AFP_LocRecoEv GaudiKernel GeneratorObjects xAODForward AthLinks)
# Install files from the package:
atlas_install_headers( AFP_LocReco )
......
ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/cmt/requirements
+ 3
− 2
View file @ d142c83e
......@@ -20,6 +20,8 @@ use AFP_Geometry AFP_Geometry-* ForwardDetectors/AFP
#use AFP_RawEv AFP_RawEv-* ForwardDetectors/AFP
use AFP_LocRecoEv AFP_LocRecoEv-* ForwardDetectors/AFP/AFP_RecoEv
use AFP_DigiEv AFP_DigiEv-* ForwardDetectors/AFP
use AFP_EventTPCnv AFP_EventTPCnv-* ForwardDetectors/AFP/AFP_EventCnv
use xAODForward xAODForward-* Event/xAOD
library AFP_LocReco *.cxx components/*.cxx
......@@ -35,9 +37,8 @@ apply_pattern declare_runtime files="-s=../share/mapping *.txt *.dat *.py"
apply_pattern declare_joboptions files="*.py"
private
#use PathResolver PathResolver-* Tools
use AthLinks AthLinks-* Control
#macro cppdebugflags '$(cppdebugflags_s)'
#macro_remove componentshr_linkopts "-Wl,-s"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment