Skip to content
This repository was archived by the owner on Dec 9, 2024. It is now read-only.

Commit

Permalink
make 0.6GeV Default
Browse files Browse the repository at this point in the history
  • Loading branch information
@GNiendorf
GNiendorf committed May 3, 2024
1 parent 113d561 commit 526e3af
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
6 changes: 3 additions & 3 deletions SDL/Constants.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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};
Expand Down
14 changes: 7 additions & 7 deletions SDL/LST.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<SDL::Dev>::endcapGeometry == nullptr) {
SDL::Globals<SDL::Dev>::endcapGeometry =
new SDL::EndcapGeometry<SDL::Dev>(devAccIn, queue, endcap_geom); // centroid values added to the map
Expand All @@ -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<SDL::Dev>::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<std::string, 4> connects{
{"_layer1_subdet5", "_layer2_subdet5", "_layer1_subdet4", "_layer2_subdet4"}};
std::string path;
Expand Down Expand Up @@ -80,7 +80,7 @@ void SDL::LST<SDL::Acc>::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<SDL::Dev>::modulesBuffers == nullptr) {
SDL::Globals<SDL::Dev>::modulesBuffers = new SDL::modulesBuffer<SDL::Dev>(devAccIn);
}
Expand Down Expand Up @@ -330,7 +330,7 @@ void SDL::LST<SDL::Acc>::prepareInput(const std::vector<float> 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]));
Expand All @@ -346,7 +346,7 @@ void SDL::LST<SDL::Acc>::prepareInput(const std::vector<float> 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
Expand Down
4 changes: 2 additions & 2 deletions bin/sdl_make_tracklooper
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions code/core/trkCore.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -1275,7 +1275,7 @@ float addInputsToLineSegmentTracking(SDL::Event<SDL::Acc> &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]);
Expand Down Expand Up @@ -1303,7 +1303,7 @@ float addInputsToLineSegmentTracking(SDL::Event<SDL::Acc> &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)
Expand Down

0 comments on commit 526e3af

Please sign in to comment.