Skip to content

Commit bdac786

Browse files
committed
Give variable better name
1 parent d8ed714 commit bdac786

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

TrackletAlgorithm/MatchProcessor.h

+5-6
Original file line numberDiff line numberDiff line change
@@ -901,7 +901,7 @@ template<TF::layerDisk Layer, TF::phiRegion PHI> constexpr uint32_t NPageSum();
901901

902902
#include "MatchProcessor_parameters.h"
903903

904-
template<regionType ASTYPE, regionType APTYPE, regionType VMSMEType, regionType FMTYPE, int maxFullMatchCopies, TF::layerDisk LAYER=TF::L1, TF::phiRegion PHISEC=TF::A>
904+
template<regionType ASTYPE, regionType APTYPE, regionType VMSMEType, regionType FMTYPE, int maxFullMatchVariants, TF::layerDisk LAYER=TF::L1, TF::phiRegion PHISEC=TF::A>
905905
void MatchCalculator(BXType bx,
906906
ap_uint<1> newtracklet,
907907
ap_uint<1>& isMatch,
@@ -913,7 +913,7 @@ void MatchCalculator(BXType bx,
913913
const AllStubMemory<ASTYPE>* allstub,
914914
const AllProjection<APTYPE>& proj,
915915
ap_uint<VMStubMECMBase<VMSMEType>::kVMSMEIDSize> stubid,
916-
FullMatchMemory<FMTYPE> fullmatch[maxFullMatchCopies]
916+
FullMatchMemory<FMTYPE> fullmatch[maxFullMatchVariants]
917917
){
918918

919919
#pragma HLS inline
@@ -1180,7 +1180,7 @@ constexpr unsigned kNbitsrzbinMPDisk = kNbitsrzbin + 1;
11801180

11811181
//////////////////////////////
11821182
// MatchProcessor
1183-
template<regionType PROJTYPE, regionType VMSMEType, unsigned kNbitsrzbinMP, regionType VMPTYPE, regionType ASTYPE, regionType FMTYPE, unsigned int nINMEM, int maxFullMatchCopies,
1183+
template<regionType PROJTYPE, regionType VMSMEType, unsigned kNbitsrzbinMP, regionType VMPTYPE, regionType ASTYPE, regionType FMTYPE, unsigned int nINMEM, int maxFullMatchVariants,
11841184
TF::layerDisk LAYER=TF::L1, TF::phiRegion PHISEC=TF::A>
11851185
void MatchProcessor(BXType bx,
11861186
// because Vivado HLS cannot synthesize an array of
@@ -1190,7 +1190,7 @@ void MatchProcessor(BXType bx,
11901190
const VMStubMEMemoryCM<VMSMEType, kNbitsrzbinMP, kNbitsphibin, kNMatchEngines>& instubdata,
11911191
const AllStubMemory<ASTYPE>* allstub,
11921192
BXType& bx_o,
1193-
FullMatchMemory<FMTYPE> fullmatch[maxFullMatchCopies]
1193+
FullMatchMemory<FMTYPE> fullmatch[maxFullMatchVariants]
11941194
){
11951195
#pragma HLS inline
11961196

@@ -1458,7 +1458,7 @@ void MatchProcessor(BXType bx,
14581458

14591459
if (hasMatch_save) {
14601460
isMatch = newtracklet_save ? ap_uint<1>(0) : isMatch;
1461-
MatchCalculator<ASTYPE, APTYPE, VMSMEType, FMTYPE, maxFullMatchCopies, LAYER, PHISEC>
1461+
MatchCalculator<ASTYPE, APTYPE, VMSMEType, FMTYPE, maxFullMatchVariants, LAYER, PHISEC>
14621462
(bx, newtracklet_save, isMatch, savedMatch, best_delta_z, best_delta_phi, best_delta_rphi, best_delta_r, allstub, allproj_save, stubindex_save,
14631463
fullmatch);
14641464
}
@@ -1483,7 +1483,6 @@ void MatchProcessor(BXType bx,
14831483
newtracklet_save = newtracklet;
14841484
allproj_save = allproj;
14851485
stubindex_save = stubindex;
1486-
14871486
} //end MC if
14881487

14891488

0 commit comments

Comments
 (0)