From 526e3af4f005ae57e38f02c9407d15ca6f0c4fd2 Mon Sep 17 00:00:00 2001 From: GNiendorf Date: Fri, 3 May 2024 13:06:50 -0400 Subject: [PATCH] make 0.6GeV Default --- SDL/Constants.h | 6 +++--- SDL/LST.cc | 14 +++++++------- bin/sdl_make_tracklooper | 4 ++-- code/core/trkCore.cc | 14 +++++++------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/SDL/Constants.h b/SDL/Constants.h index 75ff589a..92fd0dfe 100644 --- a/SDL/Constants.h +++ b/SDL/Constants.h @@ -99,9 +99,9 @@ namespace SDL { return WorkDiv(adjustedBlocks, adjustedThreads, elementsPerThreadArg); } -// If a compile time flag does not define PT_CUT, default to 0.8 (GeV) +// If a compile time flag does not define PT_CUT, default to 0.6 (GeV) #ifndef PT_CUT - constexpr float PT_CUT = 0.8f; + constexpr float PT_CUT = 0.6f; #endif const unsigned int MAX_BLOCKS = 80; @@ -124,7 +124,7 @@ namespace SDL { // Temporary fix for module buffer allocation. const unsigned int modules_size = 26401; - const unsigned int pix_tot = 1795336; + const unsigned int pix_tot = 2028724; //defining the constant host device variables right up here ALPAKA_STATIC_ACC_MEM_GLOBAL const float miniMulsPtScaleBarrel[6] = {0.0052, 0.0038, 0.0034, 0.0034, 0.0032, 0.0034}; diff --git a/SDL/LST.cc b/SDL/LST.cc index 776663ea..8331616c 100644 --- a/SDL/LST.cc +++ b/SDL/LST.cc @@ -37,9 +37,9 @@ namespace { void loadMaps(SDL::Dev const& devAccIn, SDL::QueueAcc& queue, SDL::MapPLStoLayer& pLStoLayer) { // Module orientation information (DrDz or phi angles) auto endcap_geom = - get_absolute_path_after_check_file_exists(trackLooperDir() + "/data/OT800_IT615_pt0.8/endcap_orientation.bin"); + get_absolute_path_after_check_file_exists(trackLooperDir() + "/data/OT800_IT615_pt0.6/endcap_orientation.bin"); auto tilted_geom = get_absolute_path_after_check_file_exists( - trackLooperDir() + "/data/OT800_IT615_pt0.8/tilted_barrel_orientation.bin"); + trackLooperDir() + "/data/OT800_IT615_pt0.6/tilted_barrel_orientation.bin"); if (SDL::Globals::endcapGeometry == nullptr) { SDL::Globals::endcapGeometry = new SDL::EndcapGeometry(devAccIn, queue, endcap_geom); // centroid values added to the map @@ -49,10 +49,10 @@ namespace { // Module connection map (for line segment building) auto mappath = get_absolute_path_after_check_file_exists( - trackLooperDir() + "/data/OT800_IT615_pt0.8/module_connection_tracing_merged.bin"); + trackLooperDir() + "/data/OT800_IT615_pt0.6/module_connection_tracing_merged.bin"); SDL::Globals::moduleConnectionMap.load(mappath); - auto pLSMapDir = trackLooperDir() + "/data/OT800_IT615_pt0.8/pixelmap/pLS_map"; + auto pLSMapDir = trackLooperDir() + "/data/OT800_IT615_pt0.6/pixelmap/pLS_map"; const std::array connects{ {"_layer1_subdet5", "_layer2_subdet5", "_layer1_subdet4", "_layer2_subdet4"}}; std::string path; @@ -80,7 +80,7 @@ void SDL::LST::loadAndFillES(SDL::QueueAcc& queue, struct modulesBuffe ::loadMaps(devAccIn, queue, pLStoLayer); auto path = - get_absolute_path_after_check_file_exists(trackLooperDir() + "/data/OT800_IT615_pt0.8/sensor_centroids.bin"); + get_absolute_path_after_check_file_exists(trackLooperDir() + "/data/OT800_IT615_pt0.6/sensor_centroids.bin"); if (SDL::Globals::modulesBuffers == nullptr) { SDL::Globals::modulesBuffers = new SDL::modulesBuffer(devAccIn); } @@ -330,7 +330,7 @@ void SDL::LST::prepareInput(const std::vector see_px, float eta = p3LH.eta(); float ptErr = see_ptErr[iSeed]; - if ((ptIn > 0.8 - 2 * ptErr)) { + if ((ptIn > PT_CUT - 2 * ptErr)) { XYZVector r3LH(see_stateTrajGlbX[iSeed], see_stateTrajGlbY[iSeed], see_stateTrajGlbZ[iSeed]); XYZVector p3PCA(see_px[iSeed], see_py[iSeed], see_pz[iSeed]); XYZVector r3PCA(calculateR3FromPCA(p3PCA, see_dxy[iSeed], see_dz[iSeed])); @@ -346,7 +346,7 @@ void SDL::LST::prepareInput(const std::vector see_px, if (ptIn >= 2.0) pixtype = 0; - else if (ptIn >= (0.8 - 2 * ptErr) and ptIn < 2.0) { + else if (ptIn >= (PT_CUT - 2 * ptErr) and ptIn < 2.0) { if (pixelSegmentDeltaPhiChange >= 0) pixtype = 1; else diff --git a/bin/sdl_make_tracklooper b/bin/sdl_make_tracklooper index 6c341565..c515e3cb 100755 --- a/bin/sdl_make_tracklooper +++ b/bin/sdl_make_tracklooper @@ -30,7 +30,7 @@ usage() echo " -G GPU (CUDA) backend (Compile for CUDA)" echo " -R ROCm backend (Compile for ROCm)" echo " -A All backends (Compile for all backends, including ROCm)" - echo " -P PT Cut Value (In GeV, Default is 0.8, Works only for standalone version of code)" + echo " -P PT Cut Value (In GeV, Default is 0.6, Works only for standalone version of code)" echo " -w Warning mode (Print extra warning outputs)" echo " -2 no pLS duplicate cleaning (Don't perform the pLS duplicate cleaning step)" echo @@ -73,7 +73,7 @@ if [ -z ${ROCMBACKEND} ]; then ROCMBACKEND=false; fi if [ -z ${ALLBACKENDS} ]; then ALLBACKENDS=false; fi if [ -z ${NOPLSDUPCLEAN} ]; then NOPLSDUPCLEAN=false; fi if [ -z ${PRINTWARNINGS} ]; then PRINTWARNINGS=false; fi -if [ -z ${PTCUTVALUE} ]; then PTCUTVALUE=0.8; fi +if [ -z ${PTCUTVALUE} ]; then PTCUTVALUE=0.6; fi # Default to only CPU and CUDA backends if [ "${CPUBACKEND}" == false ] && [ "${CUDABACKEND}" == false ] && [ "${ROCMBACKEND}" == false ]; then diff --git a/code/core/trkCore.cc b/code/core/trkCore.cc index 9104e3aa..8dccb53a 100644 --- a/code/core/trkCore.cc +++ b/code/core/trkCore.cc @@ -8,11 +8,11 @@ void loadMaps(SDL::Dev& devAccIn, SDL::QueueAcc& queue) TString TrackLooperDir = gSystem->Getenv("TRACKLOOPERDIR"); // Module orientation information (DrDz or phi angles) - TString endcap_geom = get_absolute_path_after_check_file_exists(TString::Format("%s/data/OT800_IT615_pt0.8/endcap_orientation.bin", TrackLooperDir.Data()).Data()); - TString tilted_geom = get_absolute_path_after_check_file_exists(TString::Format("%s/data/OT800_IT615_pt0.8/tilted_barrel_orientation.bin", TrackLooperDir.Data()).Data()); - TString mappath = get_absolute_path_after_check_file_exists(TString::Format("%s/data/OT800_IT615_pt0.8/module_connection_tracing_merged.bin", TrackLooperDir.Data()).Data()); - TString centroid = get_absolute_path_after_check_file_exists(TString::Format("%s/data/OT800_IT615_pt0.8/sensor_centroids.bin", gSystem->Getenv("TRACKLOOPERDIR")).Data()).Data(); - TString pLSMapDir = TrackLooperDir+"/data/OT800_IT615_pt0.8/pixelmap"; + TString endcap_geom = get_absolute_path_after_check_file_exists(TString::Format("%s/data/OT800_IT615_pt0.6/endcap_orientation.bin", TrackLooperDir.Data()).Data()); + TString tilted_geom = get_absolute_path_after_check_file_exists(TString::Format("%s/data/OT800_IT615_pt0.6/tilted_barrel_orientation.bin", TrackLooperDir.Data()).Data()); + TString mappath = get_absolute_path_after_check_file_exists(TString::Format("%s/data/OT800_IT615_pt0.6/module_connection_tracing_merged.bin", TrackLooperDir.Data()).Data()); + TString centroid = get_absolute_path_after_check_file_exists(TString::Format("%s/data/OT800_IT615_pt0.6/sensor_centroids.bin", gSystem->Getenv("TRACKLOOPERDIR")).Data()).Data(); + TString pLSMapDir = TrackLooperDir+"/data/OT800_IT615_pt0.6/pixelmap"; std::cout << "============ CMSSW_12_2_0_pre2 geometry ===========" << std::endl; std::cout << "endcap geometry: " << endcap_geom << std::endl; @@ -1275,7 +1275,7 @@ float addInputsToLineSegmentTracking(SDL::Event &event, bool useOMP) float ptErr = trk.see_ptErr()[iSeed]; float eta = p3LH.Eta(); - if ((ptIn > 0.8 - 2 * ptErr)) + if ((ptIn > PT_CUT - 2 * ptErr)) { TVector3 r3LH(trk.see_stateTrajGlbX()[iSeed], trk.see_stateTrajGlbY()[iSeed], trk.see_stateTrajGlbZ()[iSeed]); TVector3 p3PCA(trk.see_px()[iSeed], trk.see_py()[iSeed], trk.see_pz()[iSeed]); @@ -1303,7 +1303,7 @@ float addInputsToLineSegmentTracking(SDL::Event &event, bool useOMP) { /*ptbin = 1;*/ pixtype = 0; } - else if (ptIn >= (0.8 - 2 * ptErr) and ptIn < 2.0) + else if (ptIn >= (PT_CUT - 2 * ptErr) and ptIn < 2.0) { // ptbin = 0; if (pixelSegmentDeltaPhiChange >= 0)