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

Don't Merge - pT 0.6 Test #379

Closed
wants to merge 2 commits into from
Closed

Don't Merge - pT 0.6 Test #379

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
64c77ae
0.6 raw don't merge!
GNiendorf Mar 22, 2024
869d502
default to 0.6
GNiendorf Mar 22, 2024
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
16 changes: 8 additions & 8 deletions SDL/Constants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#ifndef Constants_cuh

Check notice on line 1 in SDL/Constants.h

View workflow job for this annotation

GitHub Actions / linter

Run clang-format on SDL/Constants.h 

File SDL/Constants.h does not conform to Custom style guidelines. (lines 129, 131, 135, 136, 138, 139)
#define Constants_cuh

#include <alpaka/alpaka.hpp>
Expand Down Expand Up @@ -122,21 +122,21 @@

// If a compile time flag does not define PT_CUT, default to 0.8 (GeV)
#ifndef PT_CUT
constexpr float PT_CUT = 0.8f;
constexpr float PT_CUT = 0.6f;
#endif

const unsigned int MAX_BLOCKS = 80;
const unsigned int MAX_CONNECTED_MODULES = 40;
const unsigned int MAX_CONNECTED_MODULES = 40*3;

const unsigned int N_MAX_PIXEL_SEGMENTS_PER_MODULE = 50000;
const unsigned int N_MAX_PIXEL_SEGMENTS_PER_MODULE = 50000*10;

const unsigned int N_MAX_PIXEL_MD_PER_MODULES = 2 * N_MAX_PIXEL_SEGMENTS_PER_MODULE;

const unsigned int N_MAX_PIXEL_TRIPLETS = 5000;
const unsigned int N_MAX_PIXEL_QUINTUPLETS = 15000;
const unsigned int N_MAX_PIXEL_TRIPLETS = 5000*8;
const unsigned int N_MAX_PIXEL_QUINTUPLETS = 15000*5;

const unsigned int N_MAX_PIXEL_TRACK_CANDIDATES = 30000;
const unsigned int N_MAX_NONPIXEL_TRACK_CANDIDATES = 1000;
const unsigned int N_MAX_PIXEL_TRACK_CANDIDATES = 30000*10;
const unsigned int N_MAX_NONPIXEL_TRACK_CANDIDATES = 1000*10;

const unsigned int size_superbins = 45000;

Expand All @@ -145,7 +145,7 @@

// Temporary fix for module buffer allocation.
const unsigned int modules_size = 26401;
const unsigned int pix_tot = 1794686;
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
2 changes: 1 addition & 1 deletion SDL/Event.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ namespace SDL {
extern uint16_t nModules;
extern uint16_t nLowerModules;
void initModules(
const char* moduleMetaDataFilePath = "data/OT800_IT615_pt0.8/sensor_centroids.txt"); //read from file and init
const char* moduleMetaDataFilePath = "data/OT800_IT615_pt0.6/sensor_centroids.txt"); //read from file and init
void freeModules();
void initModulesHost(); //read from file and init
extern std::shared_ptr<SDL::pixelMap> pixelMapping;
Expand Down
14 changes: 7 additions & 7 deletions SDL/LST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@ namespace {
void loadMaps() {
// 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.txt", trackLooperDir().Data()).Data());
TString::Format("%s/data/OT800_IT615_pt0.6/endcap_orientation.txt", trackLooperDir().Data()).Data());
TString tilted_geom = get_absolute_path_after_check_file_exists(
TString::Format("%s/data/OT800_IT615_pt0.8/tilted_barrel_orientation.txt", trackLooperDir().Data()).Data());
TString::Format("%s/data/OT800_IT615_pt0.6/tilted_barrel_orientation.txt", trackLooperDir().Data()).Data());
SDL::endcapGeometry->load(endcap_geom.Data()); // centroid values added to the map
SDL::tiltedGeometry.load(tilted_geom.Data());

// Module connection map (for line segment building)
TString mappath = get_absolute_path_after_check_file_exists(
TString::Format("%s/data/OT800_IT615_pt0.8/module_connection_tracing_merged.txt", trackLooperDir().Data())
TString::Format("%s/data/OT800_IT615_pt0.6/module_connection_tracing_merged.txt", trackLooperDir().Data())
.Data());
SDL::moduleConnectionMap.load(mappath.Data());

TString pLSMapDir = trackLooperDir() + "/data/OT800_IT615_pt0.8/pixelmap/pLS_map";
TString pLSMapDir = trackLooperDir() + "/data/OT800_IT615_pt0.6/pixelmap/pLS_map";
std::string connects[] = {"_layer1_subdet5", "_layer2_subdet5", "_layer1_subdet4", "_layer2_subdet4"};
TString path;

Expand All @@ -54,7 +54,7 @@ void SDL::LST::loadAndFillES(alpaka::QueueCpuBlocking& queue, struct modulesBuff
::loadMaps();

TString path = get_absolute_path_after_check_file_exists(
TString::Format("%s/data/OT800_IT615_pt0.8/sensor_centroids.txt", trackLooperDir().Data()).Data());
TString::Format("%s/data/OT800_IT615_pt0.6/sensor_centroids.txt", trackLooperDir().Data()).Data());
SDL::loadModulesFromFile(modules, SDL::nModules, SDL::nLowerModules, *SDL::pixelMapping, queue, path.Data());
}

Expand Down Expand Up @@ -128,7 +128,7 @@ void SDL::LST::prepareInput(const std::vector<float> see_px,
float eta = p3LH.Eta();
float ptErr = see_ptErr[iSeed];

if ((ptIn > 0.8 - 2 * ptErr)) {
if ((ptIn > 0.6 - 2 * ptErr)) {
ROOT::Math::XYZVector r3LH(see_stateTrajGlbX[iSeed], see_stateTrajGlbY[iSeed], see_stateTrajGlbZ[iSeed]);
ROOT::Math::PxPyPzMVector p3PCA(see_px[iSeed], see_py[iSeed], see_pz[iSeed], 0);
ROOT::Math::XYZVector r3PCA(calculateR3FromPCA(p3PCA, see_dxy[iSeed], see_dz[iSeed]));
Expand All @@ -144,7 +144,7 @@ void SDL::LST::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 >= (0.6 - 2 * ptErr) and ptIn < 2.0) {
if (pixelSegmentDeltaPhiChange >= 0)
pixtype = 1;
else
Expand Down
4 changes: 2 additions & 2 deletions SDL/MiniDoublet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#ifndef MiniDoublet_cuh

Check notice on line 1 in SDL/MiniDoublet.h

View workflow job for this annotation

GitHub Actions / linter

Run clang-format on SDL/MiniDoublet.h 

File SDL/MiniDoublet.h does not conform to Custom style guidelines. (lines 1068, 1071)
#define MiniDoublet_cuh

#include "Constants.h"
Expand Down Expand Up @@ -1065,10 +1065,10 @@
#endif
}

unsigned int nTotMDs = alpaka::atomicOp<alpaka::AtomicAdd>(acc, &nTotalMDs, occupancy);
unsigned int nTotMDs = alpaka::atomicOp<alpaka::AtomicAdd>(acc, &nTotalMDs, occupancy*10);

rangesInGPU.miniDoubletModuleIndices[i] = nTotMDs;
rangesInGPU.miniDoubletModuleOccupancy[i] = occupancy;
rangesInGPU.miniDoubletModuleOccupancy[i] = occupancy*10;
}

// Wait for all threads to finish before reporting final values
Expand Down
4 changes: 2 additions & 2 deletions SDL/Quintuplet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#ifndef Quintuplet_cuh

Check notice on line 1 in SDL/Quintuplet.h

View workflow job for this annotation

GitHub Actions / linter

Run clang-format on SDL/Quintuplet.h 

File SDL/Quintuplet.h does not conform to Custom style guidelines. (lines 3228, 3231)
#define Quintuplet_cuh

#include "Constants.h"
Expand Down Expand Up @@ -3225,10 +3225,10 @@
#endif
}

int nTotQ = alpaka::atomicOp<alpaka::AtomicAdd>(acc, &nTotalQuintupletsx, occupancy);
int nTotQ = alpaka::atomicOp<alpaka::AtomicAdd>(acc, &nTotalQuintupletsx, occupancy*5);
rangesInGPU.quintupletModuleIndices[i] = nTotQ;
rangesInGPU.indicesOfEligibleT5Modules[nEligibleT5Modules] = i;
rangesInGPU.quintupletModuleOccupancy[i] = occupancy;
rangesInGPU.quintupletModuleOccupancy[i] = occupancy*5;
}

// Wait for all threads to finish before reporting final values
Expand Down
4 changes: 2 additions & 2 deletions SDL/Segment.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#ifndef Segment_cuh

Check notice on line 1 in SDL/Segment.h

View workflow job for this annotation

GitHub Actions / linter

Run clang-format on SDL/Segment.h 

File SDL/Segment.h does not conform to Custom style guidelines. (lines 998, 1000)
#define Segment_cuh

#include "Constants.h"
Expand Down Expand Up @@ -995,9 +995,9 @@
#endif
}

int nTotSegs = alpaka::atomicOp<alpaka::AtomicAdd>(acc, &nTotalSegments, occupancy);
int nTotSegs = alpaka::atomicOp<alpaka::AtomicAdd>(acc, &nTotalSegments, occupancy*16);
rangesInGPU.segmentModuleIndices[i] = nTotSegs;
rangesInGPU.segmentModuleOccupancy[i] = occupancy;
rangesInGPU.segmentModuleOccupancy[i] = occupancy*16;
}

// Wait for all threads to finish before reporting final values
Expand Down
2 changes: 1 addition & 1 deletion SDL/Triplet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#ifndef Triplet_cuh

Check notice on line 1 in SDL/Triplet.h

View workflow job for this annotation

GitHub Actions / linter

Run clang-format on SDL/Triplet.h 

File SDL/Triplet.h does not conform to Custom style guidelines. (lines 2124)
#define Triplet_cuh

#include "Constants.h"
Expand Down Expand Up @@ -2121,7 +2121,7 @@
#endif
}

rangesInGPU.tripletModuleOccupancy[i] = occupancy;
rangesInGPU.tripletModuleOccupancy[i] = occupancy*16;
unsigned int nTotT = alpaka::atomicOp<alpaka::AtomicAdd>(acc, &nTotalTriplets, occupancy);
rangesInGPU.tripletModuleIndices[i] = nTotT;
}
Expand Down
2 changes: 1 addition & 1 deletion bin/sdl_make_tracklooper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ if [ -z ${ONLYCUDABACKEND} ]; then ONLYCUDABACKEND=false; fi
if [ -z ${ONLYCPUBACKEND} ]; then ONLYCPUBACKEND=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

# If using both -G and -C, -G takes priority
if [ "${ONLYCUDABACKEND}" == true ] && [ "${ONLYCPUBACKEND}" == true ]; then
Expand Down
10 changes: 5 additions & 5 deletions code/core/trkCore.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ void loadMaps()
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.txt", TrackLooperDir.Data()).Data());
TString tilted_geom = get_absolute_path_after_check_file_exists(TString::Format("%s/data/OT800_IT615_pt0.8/tilted_barrel_orientation.txt", TrackLooperDir.Data()).Data());
TString mappath = get_absolute_path_after_check_file_exists(TString::Format("%s/data/OT800_IT615_pt0.8/module_connection_tracing_merged.txt", TrackLooperDir.Data()).Data());
TString centroid = get_absolute_path_after_check_file_exists(TString::Format("%s/data/OT800_IT615_pt0.8/sensor_centroids.txt", 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.txt", TrackLooperDir.Data()).Data());
TString tilted_geom = get_absolute_path_after_check_file_exists(TString::Format("%s/data/OT800_IT615_pt0.6/tilted_barrel_orientation.txt", TrackLooperDir.Data()).Data());
TString mappath = get_absolute_path_after_check_file_exists(TString::Format("%s/data/OT800_IT615_pt0.6/module_connection_tracing_merged.txt", TrackLooperDir.Data()).Data());
TString centroid = get_absolute_path_after_check_file_exists(TString::Format("%s/data/OT800_IT615_pt0.6/sensor_centroids.txt", 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
Loading
Loading