rebase, resolve conflicts

Author: Dan Riley

L1Trigger/TrackFindingTracklet/src/TrackletLUT.cc

@@ -901,7 +901,6 @@ void TrackletLUT::initProjectionDiskRadius(int nrbits) {
 void TrackletLUT::initBendMatch(unsigned int layerdisk) {
   unsigned int nrinv = NRINVBITS;
   double rinvhalf = 0.5 * ((1 << nrinv) - 1);
-  assert(layerdisk < 16);  // should be a named constant for this
 
   bool barrel = layerdisk < N_LAYER;
 

L1Trigger/TrackFindingTracklet/test/AnalyzerDR.cc

@@ -201,7 +201,7 @@ namespace trklet {
         formTracks(lostTracks, lostStubs, lost, offset + channel);
         nTracks += tracks.size();
         nStubs += accumulate(tracks.begin(), tracks.end(), 0UL, [](auto sum, const vector<TTStubRef>& track) {
-          return sum + track.size();
+          return sum + static_cast<int>(track.size());
         });
         nLost += lost.size();
         allTracks += tracks.size();

L1Trigger/TrackFindingTracklet/test/AnalyzerDRin.cc

@@ -202,7 +202,7 @@ namespace trklet {
         formTracks(lostTracks, lostStubs, lost, offset + channel);
         nTracks += tracks.size();
         nStubs += accumulate(tracks.begin(), tracks.end(), 0UL, [](auto sum, const vector<TTStubRef>& track) {
-          return sum + track.size();
+          return sum + static_cast<int>(track.size());
         });
         nLost += lost.size();
         allTracks += tracks.size();

L1Trigger/TrackFindingTracklet/test/AnalyzerKFin.cc

@@ -193,7 +193,7 @@ namespace trklet {
         formTracks(lostTracks, lostStubs, lost, offset + channel);
         nTracks += tracks.size();
         nStubs += accumulate(tracks.begin(), tracks.end(), 0UL, [](auto sum, const vector<TTStubRef>& track) {
-          return sum + track.size();
+          return sum + static_cast<int>(track.size());
         });
         nLost += lost.size();
         allTracks += tracks.size();

L1Trigger/TrackFindingTracklet/test/AnalyzerKFout.cc

@@ -167,7 +167,7 @@ namespace trklet {
             tracks.insert(frame.first);
         nTracksRegion += tracks.size();
         nStubsRegion += accumulate(tracks.begin(), tracks.end(), 0UL, [](auto sum, const TTTrackRef& ttTrackRef) {
-          return sum + ttTrackRef->getStubRefs().size();
+          return sum + static_cast<int>(ttTrackRef->getStubRefs().size());
         });
         set<TTTrackRef> tracksLost;
         for (const FrameTrack& frame : lost)