Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace ILDCellID0 with LCTrackerCellID #1

Merged
merged 1 commit into from
Mar 22, 2017
Merged

Replace ILDCellID0 with LCTrackerCellID #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/KDCluster.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include <IMPL/TrackImpl.h>

#include <UTIL/CellIDEncoder.h>
#include "UTIL/LCTrackerConf.h"
#include <UTIL/ILDConf.h>
#include <UTIL/BitSet32.h>
#include <UTIL/LCRelationNavigator.h>
Expand Down
17 changes: 9 additions & 8 deletions src/ConformalTracking.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <IMPL/TrackImpl.h>

#include <UTIL/CellIDEncoder.h>
#include "UTIL/LCTrackerConf.h"
#include <UTIL/ILDConf.h>
#include <UTIL/BitSet32.h>
#include <UTIL/LCRelationNavigator.h>
Expand Down Expand Up @@ -110,7 +111,7 @@ ConformalTracking::ConformalTracking() : Processor("ConformalTracking") {
registerProcessorParameter( "MaxDistance", "Maximum length of a cell (max. distance between two hits)", m_maxDistance, double(0.015) );
registerProcessorParameter( "MaxChi2", "Maximum chi2/ndof for linear conformal tracks", m_chi2cut, double(300.) );
registerProcessorParameter( "MinClustersOnTrack", "Minimum number of clusters to create a track", m_minClustersOnTrack, int(6) );
registerProcessorParameter( "CellIDDecoderString","Decoding string used for Cell ID calculation", m_decoderString, std::string(lcio::ILDCellID0::encoder_string));
registerProcessorParameter( "CellIDDecoderString","Decoding string used for Cell ID calculation", m_decoderString, std::string(lcio::LCTrackerCellID::encoding_string()));

}

Expand Down Expand Up @@ -370,7 +371,7 @@ void ConformalTracking::processEvent( LCEvent* evt ) {
// Make the conformal hit, first get subdetector information to check if it is a barrel or endcap
const int celId = hit->getCellID0() ;
m_encoder.setValue(celId) ;
int side = m_encoder[lcio::ILDCellID0::side];
int side = m_encoder[lcio::LCTrackerCellID::side()];
bool isEndcap = false;
if(side != ILDDetID::barrel) isEndcap = true;
KDCluster* kdhit = new KDCluster(hit,isEndcap);
Expand Down Expand Up @@ -425,9 +426,9 @@ void ConformalTracking::processEvent( LCEvent* evt ) {

// const int celId = tempHolder[cluster]->getCellID0() ;
// m_encoder.setValue(celId) ;
// int subdet = m_encoder[lcio::ILDCellID0::subdet];
// int side = m_encoder[lcio::ILDCellID0::side];
// int layer = m_encoder[lcio::ILDCellID0::layer];
// int subdet = m_encoder[lcio::LCTrackerCellID::subdet()];
// int side = m_encoder[lcio::LCTrackerCellID::side()];
// int layer = m_encoder[lcio::LCTrackerCellID::layer()];
//
// double x = tempHolder[cluster]->getPosition()[0];
// double y = tempHolder[cluster]->getPosition()[1];
Expand Down Expand Up @@ -539,9 +540,9 @@ void ConformalTracking::processEvent( LCEvent* evt ) {
// Get subdetector information and check if the hit is in the barrel or endcaps
const int celId = hit->getCellID0() ;
m_encoder.setValue(celId) ;
int subdet = m_encoder[lcio::ILDCellID0::subdet];
int side = m_encoder[lcio::ILDCellID0::side];
int layer = m_encoder[lcio::ILDCellID0::layer];
int subdet = m_encoder[lcio::LCTrackerCellID::subdet()];
int side = m_encoder[lcio::LCTrackerCellID::side()];
int layer = m_encoder[lcio::LCTrackerCellID::layer()];
bool isEndcap = false;
if(side != ILDDetID::barrel) isEndcap = true;

Expand Down