Skip to content

Music10 tev #8

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

Merged
pandreetto merged 2 commits into from
Apr 3, 2025
Merged

Music10 tev #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9181ae5
LP: added functionalities for vertex analysis
LeonardoPalombini Feb 6, 2025
4e11f99
LP: increase mcp number limit
LeonardoPalombini Feb 20, 2025
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
2 changes: 2 additions & 0 deletions include/JetBranches.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ class JetBranches : public CollectionBranches
float _daughters_trackOmega[ LCT_JET_MAX ][ LCT_JET_PARTICLES_MAX ] {} ; /* PFOs track Omega */
float _daughters_trackZ0[ LCT_JET_MAX ][ LCT_JET_PARTICLES_MAX ] {} ; /* PFOs track Z0 */
float _daughters_trackTanLambda[ LCT_JET_MAX ][ LCT_JET_PARTICLES_MAX ] {} ; /* PFOs track TanLambda */
float _daughters_trackSigmaD0[ LCT_JET_MAX ][ LCT_JET_PARTICLES_MAX ] {} ; // error on d0 from cov matrix
float _daughters_trackSigmaZ0[ LCT_JET_MAX ][ LCT_JET_PARTICLES_MAX ] {} ; // error on Z0 from cov matrix


}; /* ----- end of class JetBranches ----- */
Expand Down
2 changes: 1 addition & 1 deletion include/LCTuple.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,4 +151,4 @@ class LCTuple : public Processor {
std::vector<PIDBranchDef> _pidBranchDefs {} ;
} ;

#endif
#endif
38 changes: 19 additions & 19 deletions include/LCTupleConf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,25 +22,25 @@ struct CollID : public lcrtrel::LCIntExtension<CollID> {} ;
// => ADJUST AS NEEDED !!!!!!
// =================================================================

#define LCT_COLLENTRIES_MAX 1000000
#define LCT_MCPARTICLE_MAX 1000000
#define LCT_RECOPARTICLE_MAX 500000
#define LCT_TRACK_MAX 1200000
#define LCT_TRACKSTATE_MAX 4000000
#define LCT_CLUSTER_MAX 500000
#define LCT_RELATION_MAX 6000000
#define LCT_SIMTRACKERHIT_MAX 6000000
#define LCT_TRACKERHIT_MAX 3000000
#define LCT_TRACKERRAWHIT_MAX 10000000
#define LCT_SIMCALORIMETERHIT_MAX 5000000
#define LCT_CALORIMETERHIT_MAX 1000000
#define LCT_PARTICLEID_MAX 1000000
#define LCT_VERTEX_MAX 1000
#define LCT_JET_MAX 200
#define LCT_JET_PARTICLES_MAX 200
#define LCT_ISOLEP_MAX 100000

#define LCT_STRING_MAX 1024
#define LCT_COLLENTRIES_MAX 1000000
#define LCT_MCPARTICLE_MAX 1000000
#define LCT_RECOPARTICLE_MAX 500000
#define LCT_TRACK_MAX 1500000
#define LCT_TRACKSTATE_MAX 100000
#define LCT_CLUSTER_MAX 500000
#define LCT_RELATION_MAX 1000000
#define LCT_SIMTRACKERHIT_MAX 2000000
#define LCT_TRACKERHIT_MAX 3000000
#define LCT_TRACKERRAWHIT_MAX 5000000
#define LCT_SIMCALORIMETERHIT_MAX 3000000
#define LCT_CALORIMETERHIT_MAX 2000000
#define LCT_PARTICLEID_MAX 1000000
#define LCT_VERTEX_MAX 1000
#define LCT_JET_MAX 200
#define LCT_JET_PARTICLES_MAX 200
#define LCT_ISOLEP_MAX 100000

#define LCT_STRING_MAX 1024

#define LCT_PARAMETERS_MAX 1000
#define LCT_PARAMVALS_MAX 50
Expand Down
2 changes: 1 addition & 1 deletion include/SimCalorimeterHitBranches.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class SimCalorimeterHitBranches : public CollectionBranches {
float _scpoz[ LCT_SIMCALORIMETERHIT_MAX ] {} ;
float _scene[ LCT_SIMCALORIMETERHIT_MAX ] {} ;
int _scmcc[ LCT_SIMCALORIMETERHIT_MAX ] {} ;
float _sctim[ LCT_SIMCALORIMETERHIT_MAX ][ 100 ] {} ;
float _sctim[ LCT_SIMCALORIMETERHIT_MAX ][ 50 ] {} ;

} ;

Expand Down
5 changes: 1 addition & 4 deletions include/TrackBranches.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,4 @@ class TrackBranches : public CollectionBranches {

} ;

#endif



#endif
1 change: 1 addition & 0 deletions include/VertexBranches.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ class VertexBranches : public CollectionBranches {

float _vtcov[ LCT_VERTEX_MAX ][6] {} ;
float _vtpar[ LCT_VERTEX_MAX ][6] {} ; //arbitrary value -- has to be checked if enough fields
float _vttrchi[LCT_VERTEX_MAX][30] {} ;
} ;

#endif
Expand Down
6 changes: 5 additions & 1 deletion src/JetBranches.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ void JetBranches::initBranches( TTree* tree, const std::string& pre){
tree->Branch( (pre+"daughters_trackOmega").c_str(), _daughters_trackOmega , (pre+"daughters_trackOmega["+pre+"njet][200]/F").c_str() ) ;
tree->Branch( (pre+"daughters_trackZ0").c_str(), _daughters_trackZ0 , (pre+"daughters_trackZ0["+pre+"njet][200]/F").c_str() ) ;
tree->Branch( (pre+"daughters_trackTanLambda").c_str(), _daughters_trackTanLambda , (pre+"daughters_trackTanLambda["+pre+"njet][200]/F").c_str() ) ;
tree->Branch( (pre+"daughters_trackSigmaD0").c_str(), _daughters_trackSigmaD0 , (pre+"daughters_trackSigmaD0["+pre+"njet][200]/F").c_str() ) ;
tree->Branch( (pre+"daughters_trackSigmaZ0").c_str(), _daughters_trackSigmaZ0 , (pre+"daughters_trackSigmaZ0["+pre+"njet][200]/F").c_str() ) ;
}


Expand Down Expand Up @@ -310,12 +312,14 @@ void JetBranches::fill(const EVENT::LCCollection* col, EVENT::LCEvent* evt )

auto tracks = particles[partid]->getTracks();

if (tracks.size()>0) {
if (tracks.size()>0 && tracks[0] != NULL) {
_daughters_trackD0[ i ][ partid ] = tracks[0]->getD0();
_daughters_trackPhi[ i ][ partid ] = tracks[0]->getPhi();
_daughters_trackOmega[ i ][ partid ] = tracks[0]->getOmega();
_daughters_trackZ0[ i ][ partid ] = tracks[0]->getZ0();
_daughters_trackTanLambda[ i ][ partid ] = tracks[0]->getTanLambda();
_daughters_trackSigmaD0[ i ][ partid ] = tracks[0]->getCovMatrix()[0];
_daughters_trackSigmaZ0[ i ][ partid ] = tracks[0]->getCovMatrix()[2];
}

}
Expand Down
2 changes: 1 addition & 1 deletion src/LCTuple.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,4 +701,4 @@ void LCTuple::decodePIDBranchDefinitions(){
}
streamlog_out( DEBUG5 ) << std::endl ;
}
}
}
7 changes: 6 additions & 1 deletion src/MCParticleBranches.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,14 @@ void MCParticleBranches::fill(const EVENT::LCCollection* col, EVENT::LCEvent* ev
if (_writeparameters) CollectionBranches::fill(col, evt);

_nmc = col->getNumberOfElements() ;

int nmax = 500;
if(_nmc > nmax) _nmc = nmax;

for(int i=0 ; i < _nmc ; ++i){

lcio::MCParticle* mcp = static_cast<lcio::MCParticle*>( col->getElementAt(i) ) ;


_mcori[i] = mcp->ext<CollID>();

_mcpdg[ i ] = mcp->getPDG() ;
Expand Down Expand Up @@ -111,5 +114,7 @@ void MCParticleBranches::fill(const EVENT::LCCollection* col, EVENT::LCEvent* ev
_mcda3[ i ] = ( p1.size() > 3 ? p1[3]->ext<CollIndex>() - 1 : -1 ) ;
_mcda4[ i ] = ( p1.size() > 4 ? p1[4]->ext<CollIndex>() - 1 : -1 ) ;


}

}
2 changes: 1 addition & 1 deletion src/SimCalorimeterHitBranches.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ void SimCalorimeterHitBranches::initBranches( TTree* tree, const std::string& pr
tree->Branch( (pre+"scpoz").c_str() , _scpoz , (pre+"scpoz["+pre+"nsch]/F").c_str() ) ;
tree->Branch( (pre+"scene").c_str() , _scene , (pre+"scene["+pre+"nsch]/F").c_str() ) ;
tree->Branch( (pre+"scmcc").c_str() , _scmcc , (pre+"scmcc["+pre+"nsch]/I").c_str() ) ;
tree->Branch( (pre+"sctim").c_str() , _sctim , (pre+"sctim["+pre+"nsch][100]/F").c_str() ) ;
tree->Branch( (pre+"sctim").c_str() , _sctim , (pre+"sctim["+pre+"nsch][50]/F").c_str() ) ;

}

Expand Down
2 changes: 1 addition & 1 deletion src/TrackBranches.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,4 +228,4 @@ void TrackBranches::fill(const EVENT::LCCollection* col, EVENT::LCEvent* evt ){
}
}
}
}
}
7 changes: 7 additions & 0 deletions src/VertexBranches.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ void VertexBranches::initBranches( TTree* tree, const std::string& pre){
tree->Branch( (pre+"vtprb").c_str() , _vtprb , (pre+"vtprb["+pre+"nvt]/F").c_str() ) ;
tree->Branch( (pre+"vtcov").c_str() , _vtcov , (pre+"vtcov["+pre+"nvt][6]/F").c_str() ) ;
tree->Branch( (pre+"vtpar").c_str() , _vtpar , (pre+"vtpar["+pre+"nvt][6]/F").c_str() ) ;
tree->Branch( (pre+"vttrchi").c_str() , _vttrchi , (pre+"vttrchi["+pre+"nvt][30]/F").c_str() ) ;
}


Expand Down Expand Up @@ -60,6 +61,12 @@ void VertexBranches::fill(const EVENT::LCCollection* col, EVENT::LCEvent* evt ){
_vtprb[i] = vtx->getProbability();
for(int j=0; j<6 ; ++j) _vtcov[ i ][ j ] = vtx->getCovMatrix()[j] ;
// for(int j=0; j<6 ; ++j) _vtpar[ i ][ j ] = vtx->getParameters()[j] ;

// additional parameters: chi2 of each track
EVENT::FloatVec tracksChi = vtx->getParameters();
for(unsigned int j = 0; j < tracksChi.size(); j++){
_vttrchi[i][j] = tracksChi[j];
}
}
}

Expand Down