Merge pull request #31596 from sbein/from-CMSSW_11_2_X_2020-08-25-230…

…0_squash_94X fix squashed fastsim decays for backport to C94x #31575
cms-sw · Sep 28, 2020 · 19e1410 · 19e1410
2 parents 507ddf9 + e26513c
commit 19e1410
Showing 1 changed file with 6 additions and 14 deletions.
diff --git a/FastSimulation/SimplifiedGeometryPropagator/src/ParticleManager.cc b/FastSimulation/SimplifiedGeometryPropagator/src/ParticleManager.cc
@@ -250,21 +250,13 @@ std::unique_ptr<fastsim::Particle> fastsim::ParticleManager::nextGenParticle()
         }
         // particles which do not descend from exotics must be produced within the beampipe
         int exoticRelativeId = 0;
-        if (productionVertex->position().perp2() * lengthUnitConversionFactor2_ > beamPipeRadius2_)  //
-        	{
-        		exoticRelativesChecker(productionVertex, exoticRelativeId, 0);
-        		if (!isExotic(exoticRelativeId)) {
-        			continue;
-        		}
-        	}
-
-
-        // particle must be produced within the beampipe
-        if(productionVertex->position().perp2()*lengthUnitConversionFactor2_ > beamPipeRadius2_)
-        {
-            continue;
+        if (productionVertex->position().perp2() * lengthUnitConversionFactor2_ > beamPipeRadius2_) { //
+            exoticRelativesChecker(productionVertex, exoticRelativeId, 0);
+            if (!isExotic(exoticRelativeId)) {
+                continue;
+            }
         }
-        
+
         // particle must not decay before it reaches the beam pipe
         if(endVertex && endVertex->position().perp2()*lengthUnitConversionFactor2_ < beamPipeRadius2_)
         {