Merge CMSSW_7_6_X into CMSSW_8_0_X.

cms-sw · Oct 19, 2015 · 6b15662 · 6b15662
2 parents 1719387 + d32f19e
commit 6b15662
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/RecoHI/HiEvtPlaneAlgos/src/HiEvtPlaneFlatProducer.cc b/RecoHI/HiEvtPlaneAlgos/src/HiEvtPlaneFlatProducer.cc
@@ -217,7 +217,7 @@ HiEvtPlaneFlatProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetu
     edm::ESHandle<RPFlatParams> flatparmsDB_;
     iSetup.get<HeavyIonRPRcd>().get(flatparmsDB_);
     LoadEPDB db(flatparmsDB_,flat);
-    if(db.IsSuccess()) return;
+    if(!db.IsSuccess()) return;
   }
   //
   //Get Centrality
@@ -280,7 +280,7 @@ HiEvtPlaneFlatProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetu
 	if(useOffsetPsi_) {
 		soff = flat[indx]->getSoffset(s, vzr_sell, bin);
 		coff = flat[indx]->getCoffset(c, vzr_sell, bin);
-		psiOffset = flat[indx]->getOffsetPsi(s, c);
+		psiOffset = flat[indx]->getOffsetPsi(soff, coff);
 	}
 	double psiFlat = flat[indx]->getFlatPsi(psiOffset,vzr_sell,bin);
 	ep[indx]= new EvtPlane(indx, 2, psiFlat, soff, coff,rp->sumw(), rp->sumw2(), rp->sumPtOrEt(), rp->sumPtOrEt2(), m);

diff --git a/RecoTracker/TkDetLayers/src/Phase2OTECRingedLayer.cc b/RecoTracker/TkDetLayers/src/Phase2OTECRingedLayer.cc
@@ -128,7 +128,11 @@ Phase2OTECRingedLayer::groupedCompatibleDetsV( const TrajectoryStateOnSurface& s
   }
 
   //order is odd rings in front of even rings
+#ifdef __INTEL_COMPILER
+  const int ringOrder[NOTECRINGS]{0,1,0,1,0,1,0,1,0,1,0,1,0,1,0};
+#else
   constexpr int ringOrder[NOTECRINGS]{0,1,0,1,0,1,0,1,0,1,0,1,0,1,0};
+#endif
   auto index = [&ringIndices,& ringOrder](int i) { return ringOrder[ringIndices[i]];};
 
   std::vector<DetGroup> closestResult;

diff --git a/RecoTracker/TkDetLayers/src/TIDLayer.cc b/RecoTracker/TkDetLayers/src/TIDLayer.cc
@@ -203,7 +203,11 @@ TIDLayer::groupedCompatibleDetsV( const TrajectoryStateOnSurface& startingState,
   std::array<vector<DetGroup>,3> groupsAtRingLevel;
   //order is ring3,ring1,ring2 i.e. 2 0 1
   //                                0 1 2  
+#ifdef __INTEL_COMPILER
+  const int ringOrder[3]{1,2,0};
+#else
   constexpr int ringOrder[3]{1,2,0};
+#endif
   auto index = [&ringIndices,& ringOrder](int i) { return ringOrder[ringIndices[i]];};
 
   auto & closestResult =  groupsAtRingLevel[index(0)];