Skip to content

Commit

Permalink
Merge pull request #89 from slava77/for-full-det-tracking/eff-val-July20
Browse files Browse the repository at this point in the history 
compile in debug; fix transition region negative
  • Loading branch information
@osschar
osschar authored Jul 26, 2017
2 parents 44dc191 + 8e7c498 commit e7f116e
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 83 deletions.
3 changes: 2 additions & 1 deletion Event.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -617,9 +617,10 @@ int Event::clean_cms_simtracks()
dprintf("Event::clean_cms_simtracks processing %d simtracks.\n", simTracks_.size());

int n_acc = 0;

int i = -1;//wrap in ifdef DEBUG?
for (Track & t : simTracks_)
{
i++;
const int nh = t.nFoundHits();

t.sortHitsByLayer();
Expand Down
4 changes: 4 additions & 0 deletions Makefile.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,5 +216,9 @@ else
MAKEDEPEND = ${CXX} -MM -MG ${DEPEND_TGTS} ${CPPFLAGS}
endif

CPPFLAGS += ${CPPUSERFLAGS}
CXXFLAGS += ${CXXUSERFLAGS}
LDFLAGS += ${LDUSERFLAGS}

%.d: %.cc
${MAKEDEPEND} -o $@ $<
4 changes: 2 additions & 2 deletions TrackerInfo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ class TrackerInfo

EtaRegion find_eta_region(float eta) const
{
if (eta < -m_eta_trans_beg) return Reg_Endcap_Neg;
else if (eta < -m_eta_trans_end) return Reg_Transition_Neg;
if (eta < -m_eta_trans_end) return Reg_Endcap_Neg;
else if (eta < -m_eta_trans_beg) return Reg_Transition_Neg;
else if (eta < m_eta_trans_beg) return Reg_Barrel;
else if (eta < m_eta_trans_end) return Reg_Transition_Pos;
else return Reg_Endcap_Pos;
Expand Down
2 changes: 1 addition & 1 deletion mkFit/MkFinder.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -810,7 +810,7 @@ void MkFinder::FindCandidatesCloneEngine(const LayerOfHits &layer_of_hits, CandC
for (int itrack = 0; itrack < N_proc; ++itrack)
{
#ifdef DEBUG
std::cout << "countInvalidHits(" << itrack << ")=" << countInvalidHits(itrack) << std::endl;
std::cout << "num_invalid_hits(" << itrack << ")=" << num_invalid_hits(itrack) << std::endl;
#endif

int fake_hit_idx = num_invalid_hits(itrack) < Config::maxHolesPerCand ? -1 : -2;
Expand Down
124 changes: 45 additions & 79 deletions validationMICwn37-build-10mu.sh
View file
Original file line number Diff line number Diff line change
@@ -1,93 +1,59 @@
#! /bin/bash

sed -i 's/#WITH_ROOT := yes/WITH_ROOT := yes/g' Makefile.config

make -j 12

ecn2=/store/disk00/slava77/analysis/CMSSW_9_1_0_pre1-tkNtuple/run1000/2017/pass-4874f28/initialStep/10muEta-24to-17Pt1to10/memoryFile.fv3.recT.071817.bin
ecn1=/store/disk00/slava77/analysis/CMSSW_9_1_0_pre1-tkNtuple/run1000/2017/pass-4874f28/initialStep/10muEta-175to-055Pt1to10/memoryFile.fv3.recT.071817.bin
brl=/store/disk00/slava77/analysis/CMSSW_9_1_0_pre1-tkNtuple/run1000/2017/pass-4874f28/initialStep/10muEtaLT06Pt1to10/memoryFile.fv3.recT.071817.bin
ecp1=/store/disk00/slava77/analysis/CMSSW_9_1_0_pre1-tkNtuple/run1000/2017/pass-4874f28/initialStep/10muEta055to175Pt1to10/memoryFile.fv3.recT.071817.bin
ecp2=/store/disk00/slava77/analysis/CMSSW_9_1_0_pre1-tkNtuple/run1000/2017/pass-4874f28/initialStep/10muEta17to24Pt1to10/memoryFile.fv3.recT.071817.bin


## ECN2 ##
echo "SNB CMSSW BH (ECN2): validation [nTH:1, nVU:8]"
./mkFit/mkFit --geom CMS-2017 --root-val --read --file-name ${ecn2} --build-bh --num-thr 8 >& log_SNB_CMSSW_ECN2_BH_NVU8int_NTH8_val.txt
mv valtree.root valtree_SNB_CMSSW_ECN2_BH.root
echo "SNB CMSSW STD (ECN2): validation [nTH:8, nVU:8]"
./mkFit/mkFit --geom CMS-2017 --root-val --read --file-name ${ecn2} --build-std --num-thr 8 >& log_SNB_CMSSW_ECN2_STD_NVU8int_NTH8_val.txt
mv valtree.root valtree_SNB_CMSSW_ECN2_STD.root
echo "SNB CMSSW CE (ECN2): validation [nTH:8, nVU:8]"
./mkFit/mkFit --geom CMS-2017 --root-val --read --file-name ${ecn2} --build-ce --num-thr 8 >& log_SNB_CMSSW_ECN2_CE_NVU8int_NTH8_val.txt
mv valtree.root valtree_SNB_CMSSW_ECN2_CE.root

## ECN1 ##
echo "SNB CMSSW BH (ECN1): validation [nTH:8, nVU:8]"
./mkFit/mkFit --geom CMS-2017 --root-val --read --file-name ${ecn1} --build-bh --num-thr 8 >& log_SNB_CMSSW_ECN1_BH_NVU8int_NTH8_val.txt
mv valtree.root valtree_SNB_CMSSW_ECN1_BH.root
echo "SNB CMSSW STD (ECN1): validation [nTH:8, nVU:8]"
./mkFit/mkFit --geom CMS-2017 --root-val --read --file-name ${ecn1} --build-std --num-thr 8 >& log_SNB_CMSSW_ECN1_STD_NVU8int_NTH8_val.txt
mv valtree.root valtree_SNB_CMSSW_ECN1_STD.root
echo "SNB CMSSW CE (ECN1): validation [nTH:8, nVU:8]"
./mkFit/mkFit --geom CMS-2017 --root-val --read --file-name ${ecn1} --build-ce --num-thr 8 >& log_SNB_CMSSW_ECN1_CE_NVU8int_NTH8_val.txt
mv valtree.root valtree_SNB_CMSSW_ECN1_CE.root

## BRL ##
echo "SNB CMSSW BH (BRL): validation [nTH:8, nVU:8]"
./mkFit/mkFit --geom CMS-2017 --root-val --read --file-name ${brl} --build-bh --num-thr 8 >& log_SNB_CMSSW_BRL_BH_NVU8int_NTH8_val.txt
mv valtree.root valtree_SNB_CMSSW_BRL_BH.root
echo "SNB CMSSW STD (BRL): validation [nTH:8, nVU:8]"
./mkFit/mkFit --geom CMS-2017 --root-val --read --file-name ${brl} --build-std --num-thr 8 >& log_SNB_CMSSW_BRL_STD_NVU8int_NTH8_val.txt
mv valtree.root valtree_SNB_CMSSW_BRL_STD.root
echo "SNB CMSSW CE (BRL): validation [nTH:8, nVU:8]"
./mkFit/mkFit --geom CMS-2017 --root-val --read --file-name ${brl} --build-ce --num-thr 8 >& log_SNB_CMSSW_BRL_CE_NVU8int_NTH8_val.txt
mv valtree.root valtree_SNB_CMSSW_BRL_CE.root

## ECP1 ##
echo "SNB CMSSW BH (ECP1): validation [nTH:8, nVU:8]"
./mkFit/mkFit --geom CMS-2017 --root-val --read --file-name ${ecp1} --build-bh --num-thr 8 >& log_SNB_CMSSW_ECP1_BH_NVU8int_NTH8_val.txt
mv valtree.root valtree_SNB_CMSSW_ECP1_BH.root
echo "SNB CMSSW STD (ECP1): validation [nTH:8, nVU:8]"
./mkFit/mkFit --geom CMS-2017 --root-val --read --file-name ${ecp1} --build-std --num-thr 8 >& log_SNB_CMSSW_ECP1_STD_NVU8int_NTH8_val.txt
mv valtree.root valtree_SNB_CMSSW_ECP1_STD.root
echo "SNB CMSSW CE (ECP1): validation [nTH:8, nVU:8]"
./mkFit/mkFit --geom CMS-2017 --root-val --read --file-name ${ecp1} --build-ce --num-thr 8 >& log_SNB_CMSSW_ECP1_CE_NVU8int_NTH8_val.txt
mv valtree.root valtree_SNB_CMSSW_ECP1_CE.root

## ECP2 ##
echo "SNB CMSSW BH (ECP2): validation [nTH:8, nVU:8]"
./mkFit/mkFit --geom CMS-2017 --root-val --read --file-name ${ecp2} --build-bh --num-thr 8 >& log_SNB_CMSSW_ECP2_BH_NVU8int_NTH8_val.txt
mv valtree.root valtree_SNB_CMSSW_ECP2_BH.root
echo "SNB CMSSW STD (ECP2): validation [nTH:8, nVU:8]"
./mkFit/mkFit --geom CMS-2017 --root-val --read --file-name ${ecp2} --build-std --num-thr 8 >& log_SNB_CMSSW_ECP2_STD_NVU8int_NTH8_val.txt
mv valtree.root valtree_SNB_CMSSW_ECP2_STD.root
echo "SNB CMSSW CE (ECP2): validation [nTH:8, nVU:8]"
./mkFit/mkFit --geom CMS-2017 --root-val --read --file-name ${ecp2} --build-ce --num-thr 8 >& log_SNB_CMSSW_ECP2_CE_NVU8int_NTH8_val.txt
mv valtree.root valtree_SNB_CMSSW_ECP2_CE.root



sed -i 's/WITH_ROOT := yes/#WITH_ROOT := yes/g' Makefile.config
make -j 12 WITH_ROOT=yes

ECN2=/store/disk00/slava77/analysis/CMSSW_9_1_0_pre1-tkNtuple/run1000/2017/pass-4874f28/initialStep/10muEta-24to-17Pt1to10/memoryFile.fv3.recT.071817.bin
ECN1=/store/disk00/slava77/analysis/CMSSW_9_1_0_pre1-tkNtuple/run1000/2017/pass-4874f28/initialStep/10muEta-175to-055Pt1to10/memoryFile.fv3.recT.071817.bin
BRL=/store/disk00/slava77/analysis/CMSSW_9_1_0_pre1-tkNtuple/run1000/2017/pass-4874f28/initialStep/10muEtaLT06Pt1to10/memoryFile.fv3.recT.071817.bin
ECP1=/store/disk00/slava77/analysis/CMSSW_9_1_0_pre1-tkNtuple/run1000/2017/pass-4874f28/initialStep/10muEta055to175Pt1to10/memoryFile.fv3.recT.071817.bin
ECP2=/store/disk00/slava77/analysis/CMSSW_9_1_0_pre1-tkNtuple/run1000/2017/pass-4874f28/initialStep/10muEta17to24Pt1to10/memoryFile.fv3.recT.071817.bin

for section in ECN2 ECN1 BRL ECP1 ECP2; do
echo "SNB CMSSW_sim BH (${section}): validation [nTH:1, nVU:8]"
./mkFit/mkFit --geom CMS-2017 --root-val --read --file-name ${!section} --build-bh --num-thr 8 >& log_SNB_CMSSW_sim_${section}_BH_NVU8int_NTH8_val.txt
mv valtree.root valtree_SNB_CMSSW_sim_${section}_BH.root
echo "SNB CMSSW_sim STD (${section}): validation [nTH:8, nVU:8]"
./mkFit/mkFit --geom CMS-2017 --root-val --read --file-name ${!section} --build-std --num-thr 8 >& log_SNB_CMSSW_sim_${section}_STD_NVU8int_NTH8_val.txt
mv valtree.root valtree_SNB_CMSSW_sim_${section}_STD.root
echo "SNB CMSSW_sim CE (${section}): validation [nTH:8, nVU:8]"
./mkFit/mkFit --geom CMS-2017 --root-val --read --file-name ${!section} --build-ce --num-thr 8 >& log_SNB_CMSSW_sim_${section}_CE_NVU8int_NTH8_val.txt
mv valtree.root valtree_SNB_CMSSW_sim_${section}_CE.root
done
for section in ECN2 ECN1 BRL ECP1 ECP2; do
echo "SNB CMSSW_see BH (${section}): validation [nTH:1, nVU:8]"
./mkFit/mkFit --geom CMS-2017 --root-val --read --file-name ${!section} --build-bh --cmssw-seeds --num-thr 8 >& log_SNB_CMSSW_see_${section}_BH_NVU8int_NTH8_val.txt
mv valtree.root valtree_SNB_CMSSW_see_${section}_BH.root
echo "SNB CMSSW_see STD (${section}): validation [nTH:8, nVU:8]"
./mkFit/mkFit --geom CMS-2017 --root-val --read --file-name ${!section} --build-std --cmssw-seeds --num-thr 8 >& log_SNB_CMSSW_see_${section}_STD_NVU8int_NTH8_val.txt
mv valtree.root valtree_SNB_CMSSW_see_${section}_STD.root
echo "SNB CMSSW_see CE (${section}): validation [nTH:8, nVU:8]"
./mkFit/mkFit --geom CMS-2017 --root-val --read --file-name ${!section} --build-ce --cmssw-seeds --num-thr 8 >& log_SNB_CMSSW_see_${section}_CE_NVU8int_NTH8_val.txt
mv valtree.root valtree_SNB_CMSSW_see_${section}_CE.root
done

make clean

for section in ECN2 ECN1 BRL ECP1 ECP2
for opt in sim see
do
for section in ECN2 ECN1 BRL ECP1 ECP2
do
for build in BH STD CE
do
root -b -q -l runValidation.C+\(\"_SNB_CMSSW_${opt}_${section}_${build}\"\)
done
root -b -q -l makeValidation.C+\(\"SNB_CMSSW_${opt}_${section}\"\)
done

for build in BH STD CE
do
root -b -q -l runValidation.C+\(\"_SNB_CMSSW_${section}_${build}\"\)
hadd valtree_SNB_CMSSW_${opt}_FullDet_${build}.root validation_SNB_CMSSW_${opt}_ECN2_${build}/valtree_SNB_CMSSW_${opt}_ECN2_${build}.root validation_SNB_CMSSW_${opt}_ECN1_${build}/valtree_SNB_CMSSW_${opt}_ECN1_${build}.root validation_SNB_CMSSW_${opt}_BRL_${build}/valtree_SNB_CMSSW_${opt}_BRL_${build}.root validation_SNB_CMSSW_${opt}_ECP1_${build}/valtree_SNB_CMSSW_${opt}_ECP1_${build}.root validation_SNB_CMSSW_${opt}_ECP2_${build}/valtree_SNB_CMSSW_${opt}_ECP2_${build}.root

root -b -q -l runValidation.C+\(\"_SNB_CMSSW_${opt}_FullDet_${build}\"\)
done
root -b -q -l makeValidation.C+\(\"SNB_CMSSW_${section}\"\)
done

for build in BH STD CE
do
hadd valtree_SNB_CMSSW_FullDet_${build}.root validation_SNB_CMSSW_ECN2_${build}/valtree_SNB_CMSSW_ECN2_${build}.root validation_SNB_CMSSW_ECN1_${build}/valtree_SNB_CMSSW_ECN1_${build}.root validation_SNB_CMSSW_BRL_${build}/valtree_SNB_CMSSW_BRL_${build}.root validation_SNB_CMSSW_ECP1_${build}/valtree_SNB_CMSSW_ECP1_${build}.root validation_SNB_CMSSW_ECP2_${build}/valtree_SNB_CMSSW_ECP2_${build}.root
root -b -q -l makeValidation.C+\(\"SNB_CMSSW_${opt}_FullDet\"\)

root -b -q -l runValidation.C+\(\"_SNB_CMSSW_FullDet_${build}\"\)
done

root -b -q -l makeValidation.C+\(\"SNB_CMSSW_FullDet\"\)
make distclean

make distclean

0 comments on commit e7f116e

Please sign in to comment.