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

Commit 0db2cb7

Browse files
tresreidtresreid
committed
minor fixes
1 parent 7c2a91b commit 0db2cb7

File tree

6 files changed

+35
-30
lines changed

6 files changed

+35
-30
lines changed

‎SDL/Event.cu‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -687,8 +687,7 @@ void SDL::Event::addPixelSegmentToEvent(std::vector<unsigned int> hitIndices0,st
687687
cudaStreamSynchronize(stream);
688688
nTotalMDs+= N_MAX_PIXEL_MD_PER_MODULES;
689689
cudaFree(device_nTotalMDs);
690-
createMDsInExplicitMemory(*mdsInGPU, nTotalMDs, nLowerModules, N_MAX_PIXEL_MD_PER_MODULES,stream);
691-
690+
createMDsInExplicitMemory(*mdsInGPU, nTotalMDs, nLowerModules, N_MAX_PIXEL_MD_PER_MODULES,stream);
692691
cudaMemcpyAsync(mdsInGPU->nMemoryLocations, &nTotalMDs, sizeof(unsigned int), cudaMemcpyHostToDevice, stream);
693692
cudaStreamSynchronize(stream);
694693

@@ -902,14 +901,14 @@ void SDL::Event::createMiniDoublets()
902901
{
903902
//hardcoded range numbers for this will come from studies!
904903
unsigned int nTotalMDs;
905-
unsigned int *device_nTotalMDs;
906-
cudaMalloc((void **)&device_nTotalMDs, sizeof(unsigned int));
907-
cudaMemsetAsync(&rangesInGPU->miniDoubletModuleOccupancy[nLowerModules],N_MAX_PIXEL_MD_PER_MODULES, sizeof(unsigned int),stream);
908-
createMDArrayRangesGPU<<<1,1024,0,stream>>>(*modulesInGPU, *rangesInGPU, device_nTotalMDs);
909-
cudaMemcpyAsync(&nTotalMDs,device_nTotalMDs,sizeof(unsigned int),cudaMemcpyDeviceToHost,stream);
910-
cudaStreamSynchronize(stream);
911-
nTotalMDs+=N_MAX_PIXEL_MD_PER_MODULES;
912-
cudaFree(device_nTotalMDs);
904+
unsigned int *device_nTotalMDs;
905+
cudaMalloc((void **)&device_nTotalMDs, sizeof(unsigned int));
906+
cudaMemsetAsync(&rangesInGPU->miniDoubletModuleOccupancy[nLowerModules],N_MAX_PIXEL_MD_PER_MODULES, sizeof(unsigned int),stream);
907+
createMDArrayRangesGPU<<<1,1024,0,stream>>>(*modulesInGPU, *rangesInGPU, device_nTotalMDs);
908+
cudaMemcpyAsync(&nTotalMDs,device_nTotalMDs,sizeof(unsigned int),cudaMemcpyDeviceToHost,stream);
909+
cudaStreamSynchronize(stream);
910+
nTotalMDs+=N_MAX_PIXEL_MD_PER_MODULES;
911+
cudaFree(device_nTotalMDs);
913912

914913
if(mdsInGPU == nullptr)
915914
{

‎SDL/MiniDoublet.cu‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ __global__ void SDL::createMDArrayRangesGPU(struct modules& modulesInGPU, struct
3434
module_subdets = modulesInGPU.subdets[i];
3535
module_layers = modulesInGPU.layers[i];
3636
module_rings = modulesInGPU.rings[i];
37-
module_eta = modulesInGPU.eta[i];
37+
module_eta = abs(modulesInGPU.eta[i]);
3838
unsigned int occupancy;
3939
unsigned int category_number, eta_number;
4040
if (module_layers<=3 && module_subdets==5) category_number = 0;
@@ -44,10 +44,10 @@ __global__ void SDL::createMDArrayRangesGPU(struct modules& modulesInGPU, struct
4444
else if (module_layers<=2 && module_subdets==4 && module_rings<=10) category_number = 3;
4545
else if (module_layers>=3 && module_subdets==4 && module_rings<=7) category_number = 3;
4646

47-
if (abs(module_eta)<0.75) eta_number=0;
48-
else if (abs(module_eta)>0.75 && abs(module_eta)<1.5) eta_number=1;
49-
else if (abs(module_eta)>1.5 && abs(module_eta)<2.25) eta_number=2;
50-
else if (abs(module_eta)>2.25 && abs(module_eta)<3) eta_number=3;
47+
if (module_eta<0.75) eta_number=0;
48+
else if (module_eta>0.75 && module_eta<1.5) eta_number=1;
49+
else if (module_eta>1.5 && module_eta<2.25) eta_number=2;
50+
else if (module_eta>2.25 && module_eta<3) eta_number=3;
5151

5252
if (category_number == 0 && eta_number == 0) occupancy = 49;
5353
else if (category_number == 0 && eta_number == 1) occupancy = 42;

‎SDL/Quintuplet.cu‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ __global__ void SDL::createEligibleModulesListForQuintupletsGPU(struct modules&
105105
layers = modulesInGPU.layers[i];
106106
subdets = modulesInGPU.subdets[i];
107107
rings = modulesInGPU.rings[i];
108-
eta = modulesInGPU.eta[i];
108+
eta = abs(modulesInGPU.eta[i]);
109109
occupancy = 0;
110110

111111
if (tripletsInGPU.nTriplets[i] == 0) continue;
@@ -119,10 +119,10 @@ __global__ void SDL::createEligibleModulesListForQuintupletsGPU(struct modules&
119119
else if (layers>=3 && subdets==4 && rings>=8) category_number = 2;
120120
else if (layers<=2 && subdets==4 && rings<=10) category_number = 3;
121121
else if (layers>=3 && subdets==4 && rings<=7) category_number = 3;
122-
if (abs(eta)<0.75) eta_number=0;
123-
else if (abs(eta)>0.75 && abs(eta)<1.5) eta_number=1;
124-
else if (abs(eta)>1.5 && abs(eta)<2.25) eta_number=2;
125-
else if (abs(eta)>2.25 && abs(eta)<3) eta_number=3;
122+
if (eta<0.75) eta_number=0;
123+
else if (eta>0.75 && eta<1.5) eta_number=1;
124+
else if (eta>1.5 && eta<2.25) eta_number=2;
125+
else if (eta>2.25 && eta<3) eta_number=3;
126126

127127
if (category_number == 0 && eta_number == 0) occupancy = 336;
128128
else if (category_number == 0 && eta_number == 1) occupancy = 414;

‎SDL/Segment.cu‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ __global__ void SDL::createSegmentArrayRanges(struct modules& modulesInGPU, stru
5353
module_subdets = modulesInGPU.subdets[i];
5454
module_layers = modulesInGPU.layers[i];
5555
module_rings = modulesInGPU.rings[i];
56-
module_eta = modulesInGPU.eta[i];
56+
module_eta = abs(modulesInGPU.eta[i]);
5757
unsigned int occupancy;
5858
unsigned int category_number, eta_number;
5959
if (module_layers<=3 && module_subdets==5) category_number = 0;
@@ -62,10 +62,10 @@ __global__ void SDL::createSegmentArrayRanges(struct modules& modulesInGPU, stru
6262
else if (module_layers>=3 && module_subdets==4 && module_rings>=8) category_number = 2;
6363
else if (module_layers<=2 && module_subdets==4 && module_rings<=10) category_number = 3;
6464
else if (module_layers>=3 && module_subdets==4 && module_rings<=7) category_number = 3;
65-
if (abs(module_eta)<0.75) eta_number=0;
66-
else if (abs(module_eta)>0.75 && abs(module_eta)<1.5) eta_number=1;
67-
else if (abs(module_eta)>1.5 && abs(module_eta)<2.25) eta_number=2;
68-
else if (abs(module_eta)>2.25 && abs(module_eta)<3) eta_number=3;
65+
if (module_eta<0.75) eta_number=0;
66+
else if (module_eta>0.75 && module_eta<1.5) eta_number=1;
67+
else if (module_eta>1.5 && module_eta<2.25) eta_number=2;
68+
else if (module_eta>2.25 && module_eta<3) eta_number=3;
6969

7070
if (category_number == 0 && eta_number == 0) occupancy = 572;
7171
else if (category_number == 0 && eta_number == 1) occupancy = 300;

‎SDL/Triplet.cu‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ __global__ void SDL::createTripletArrayRanges(struct modules& modulesInGPU, stru
3939
module_subdets = modulesInGPU.subdets[i];
4040
module_layers = modulesInGPU.layers[i];
4141
module_rings = modulesInGPU.rings[i];
42-
module_eta = modulesInGPU.eta[i];
42+
module_eta = abs(modulesInGPU.eta[i]);
4343
unsigned int occupancy;
4444
unsigned int category_number, eta_number;
4545
if (module_layers<=3 && module_subdets==5) category_number = 0;
@@ -48,10 +48,10 @@ __global__ void SDL::createTripletArrayRanges(struct modules& modulesInGPU, stru
4848
else if (module_layers>=3 && module_subdets==4 && module_rings>=8) category_number = 2;
4949
else if (module_layers<=2 && module_subdets==4 && module_rings<=10) category_number = 3;
5050
else if (module_layers>=3 && module_subdets==4 && module_rings<=7) category_number = 3;
51-
if (abs(module_eta)<0.75) eta_number=0;
52-
else if (abs(module_eta)>0.75 && abs(module_eta)<1.5) eta_number=1;
53-
else if (abs(module_eta)>1.5 && abs(module_eta)<2.25) eta_number=2;
54-
else if (abs(module_eta)>2.25 && abs(module_eta)<3) eta_number=3;
51+
if (module_eta<0.75) eta_number=0;
52+
else if (module_eta>0.75 && module_eta<1.5) eta_number=1;
53+
else if (module_eta>1.5 && module_eta<2.25) eta_number=2;
54+
else if (module_eta>2.25 && module_eta<3) eta_number=3;
5555

5656
if (category_number == 0 && eta_number == 0) occupancy = 543;
5757
else if (category_number == 0 && eta_number == 1) occupancy = 235;

‎moveplots.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
#outdir=minitest #SegmentLinking_keep/PR178_compv3
3+
outdir=SegmentLinking_keep/PR274
4+
rm -r /cdat/tem/mgr85/www/${outdir}
5+
cp -r performance/ /cdat/tem/mgr85/www/${outdir}
6+
#mv performance/ /cdat/tem/mgr85/www/${outdir}

0 commit comments

Comments
 (0)