From 41ebef889f762a2486bbdddd62c588ca5235fa5f Mon Sep 17 00:00:00 2001 From: wenxingfang <1473717798@qq.com> Date: Tue, 10 Nov 2020 16:24:08 +0800 Subject: [PATCH] clean code --- .../GaudiPandora/include/PandoraPFAlg.h | 24 ---------- .../Pandora/GaudiPandora/src/PandoraPFAlg.cpp | 44 ------------------- 2 files changed, 68 deletions(-) diff --git a/Reconstruction/PFA/Pandora/GaudiPandora/include/PandoraPFAlg.h b/Reconstruction/PFA/Pandora/GaudiPandora/include/PandoraPFAlg.h index 67eb4835..681c7887 100644 --- a/Reconstruction/PFA/Pandora/GaudiPandora/include/PandoraPFAlg.h +++ b/Reconstruction/PFA/Pandora/GaudiPandora/include/PandoraPFAlg.h @@ -3,7 +3,6 @@ #include "FWCore/DataHandle.h" #include "GaudiAlg/GaudiAlgorithm.h" -//#include <gsl/gsl_rng.h> #include "edm4hep/ClusterCollection.h" #include "edm4hep/ReconstructedParticleCollection.h" #include "edm4hep/EventHeaderCollection.h" @@ -39,9 +38,6 @@ #include "PfoCreator.h" #include "TrackCreator.h" -//#include "TROOT.h" -//#include "TTree.h" -//#include "TFile.h" #include "GaudiKernel/INTupleSvc.h" #include "GaudiKernel/NTuple.h" @@ -278,26 +274,6 @@ protected: - /* - TFile* m_fout; - TTree* m_tree; - std::vector<int > m_pReco_PID; - std::vector<float> m_pReco_mass; - std::vector<float> m_pReco_energy; - std::vector<float> m_pReco_px; - std::vector<float> m_pReco_py; - std::vector<float> m_pReco_pz; - std::vector<float> m_pReco_charge; - std::vector<int> m_mc_p_size; - std::vector<int> m_mc_pid ; - std::vector<float> m_mc_mass ; - std::vector<float> m_mc_px ; - std::vector<float> m_mc_py ; - std::vector<float> m_mc_pz ; - std::vector<float> m_mc_charge; - int m_hasConversion; - Gaudi::Property< std::string > m_AnaOutput{ this, "AnaOutput", "Pan_Ana.root" }; - */ Gaudi::Property<bool> m_WriteAna {this, "WriteAna", false,"if do ana"}; Gaudi::Property<bool> m_use_dd4hep_geo{this, "use_dd4hep_geo", false,"choose if use geo info from dd4hep"}; diff --git a/Reconstruction/PFA/Pandora/GaudiPandora/src/PandoraPFAlg.cpp b/Reconstruction/PFA/Pandora/GaudiPandora/src/PandoraPFAlg.cpp index bde13536..5c5ba411 100644 --- a/Reconstruction/PFA/Pandora/GaudiPandora/src/PandoraPFAlg.cpp +++ b/Reconstruction/PFA/Pandora/GaudiPandora/src/PandoraPFAlg.cpp @@ -6,7 +6,6 @@ #include "edm4hep/SimCalorimeterHit.h" #include "edm4hep/CaloHitContribution.h" #include "edm4hep/ClusterConst.h" -//#include "UTIL/ILDConf.h" #include <cmath> #include <algorithm> #include "gear/BField.h" @@ -115,27 +114,6 @@ StatusCode PandoraPFAlg::initialize() } } } - /* - std::string s_output =m_AnaOutput; - m_fout = new TFile(s_output.c_str(),"RECREATE"); - m_tree = new TTree("evt","tree"); - m_tree->Branch("m_pReco_PID" , &m_pReco_PID ); - m_tree->Branch("m_pReco_mass" , &m_pReco_mass ); - m_tree->Branch("m_pReco_energy", &m_pReco_energy); - m_tree->Branch("m_pReco_px" , &m_pReco_px ); - m_tree->Branch("m_pReco_py" , &m_pReco_py ); - m_tree->Branch("m_pReco_pz" , &m_pReco_pz ); - m_tree->Branch("m_pReco_charge", &m_pReco_charge); - - m_tree->Branch("m_mc_p_size", &m_mc_p_size); - m_tree->Branch("m_mc_pid" , &m_mc_pid ); - m_tree->Branch("m_mc_mass" , &m_mc_mass ); - m_tree->Branch("m_mc_px" , &m_mc_px ); - m_tree->Branch("m_mc_py" , &m_mc_py ); - m_tree->Branch("m_mc_pz" , &m_mc_pz ); - m_tree->Branch("m_mc_charge", &m_mc_charge); - m_tree->Branch("m_hasConversion", &m_hasConversion); - */ for ( const auto& col : m_readCols ) { auto seperater = col.find(':'); std::string colType = col.substr(0, seperater); @@ -391,9 +369,6 @@ StatusCode PandoraPFAlg::execute() StatusCode PandoraPFAlg::finalize() { info() << "Finalized. Processed " << _nEvt << " events " << endmsg; - //m_fout->cd(); - //m_tree->Write(); - //m_fout->Close(); delete m_pPandora; delete m_pGeometryCreator; delete m_pCaloHitCreator; @@ -427,24 +402,6 @@ void PandoraPFAlg::Reset() m_pCaloHitCreator->Reset(); m_pTrackCreator->Reset(); m_pMCParticleCreator->Reset(); - /* - std::vector<int>() .swap(m_pReco_PID ); - std::vector<float>().swap(m_pReco_mass); - std::vector<float>().swap(m_pReco_energy); - std::vector<float>().swap(m_pReco_px); - std::vector<float>().swap(m_pReco_py); - std::vector<float>().swap(m_pReco_pz); - std::vector<float>().swap(m_pReco_charge); - - std::vector<int>() .swap(m_mc_p_size); - std::vector<int>() .swap(m_mc_pid ); - std::vector<float>().swap(m_mc_mass ); - std::vector<float>().swap(m_mc_px ); - std::vector<float>().swap(m_mc_py ); - std::vector<float>().swap(m_mc_pz ); - std::vector<float>().swap(m_mc_charge); - m_hasConversion = 0; - */ m_CollectionMaps->clear(); } @@ -627,7 +584,6 @@ StatusCode PandoraPFAlg::Ana() if(hasEm && hasEp) m_hasConversion=1; } } - //m_tree->Fill(); StatusCode status = m_tuple->write(); if ( status.isFailure() ) { error() << " Cannot fill N-tuple:" << long( m_tuple ) << endmsg; -- GitLab