Skip to content

Commit 85aaaac

Browse files
committed
Attempt to fix gcc 4.9.0 issue.
1 parent 76b8a37 commit 85aaaac

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

TrackPropagation/SteppingHelixPropagator/src/SteppingHelixPropagator.cc

+8-8
Original file line numberDiff line numberDiff line change
@@ -1930,7 +1930,7 @@ SteppingHelixPropagator::refToMagVolume(const SteppingHelixPropagator::StateInfo
19301930
int iDistMin = -1;
19311931

19321932
unsigned int iFDestSorted[6] = {0,0,0,0,0,0};
1933-
unsigned int nDestSorted =0;
1933+
int nDestSorted =0;
19341934
unsigned int nearParallels = 0;
19351935

19361936
double curP = sv.p3.mag();
@@ -2040,29 +2040,29 @@ SteppingHelixPropagator::refToMagVolume(const SteppingHelixPropagator::StateInfo
20402040
<<tanDistToFace[iFace]<<" "<<distToFace[iFace]<<" "<<refDirectionToFace[iFace]<<" "<<dir<<std::endl;
20412041

20422042
}
2043-
2044-
for (unsigned int i = 0;i<nDestSorted; ++i){
2045-
unsigned int iMax = nDestSorted-i-1;
2046-
for (unsigned int j=0;j<nDestSorted-i; ++j){
2043+
2044+
for (int i = 0;i<nDestSorted; ++i){
2045+
int iMax = nDestSorted-i-1;
2046+
for (int j=0;j<nDestSorted-i; ++j){
20472047
if (fabs(tanDistToFace[iFDestSorted[j]]) > fabs(tanDistToFace[iFDestSorted[iMax]]) ){
20482048
iMax = j;
20492049
}
20502050
}
2051-
unsigned int iTmp = iFDestSorted[nDestSorted-i-1];
2051+
int iTmp = iFDestSorted[nDestSorted-i-1];
20522052
iFDestSorted[nDestSorted-i-1] = iFDestSorted[iMax];
20532053
iFDestSorted[iMax] = iTmp;
20542054
}
20552055

20562056
if (debug_){
2057-
for (unsigned int i=0;i<nDestSorted;++i){
2057+
for (int i=0;i<nDestSorted;++i){
20582058
LogTrace(metname)<<std::setprecision(17)<<std::setw(20)<<std::scientific<<cVol<<" "<<i<<" "<<iFDestSorted[i]<<" "<<tanDistToFace[iFDestSorted[i]]<<std::endl;
20592059
}
20602060
}
20612061

20622062
//now go from the shortest to the largest distance hoping to get a point in the volume.
20632063
//other than in case of a near-parallel travel this should stop after the first try
20642064

2065-
for (unsigned int i=0; i<nDestSorted;++i){
2065+
for (int i=0; i<nDestSorted;++i){
20662066
iFDest = iFDestSorted[i];
20672067

20682068
double sign = dir == alongMomentum ? 1. : -1.;

0 commit comments

Comments
 (0)