@@ -197,8 +197,7 @@ struct UpcRhoAnalysis {
197197 Configurable<float > collisionsPosZMaxCut{" collisionsPosZMaxCut" , 10.0 , " max Z position cut on collisions" };
198198 Configurable<bool > cutNumContribs{" cutNumContribs" , true , " cut on number of contributors" };
199199 Configurable<int > collisionsNumContribsMaxCut{" collisionsNumContribsMaxCut" , 2 , " max number of contributors cut on collisions" };
200- Configurable<float > znCommonEnergyCut{" znCommonEnergyCut" , 0.0 , " ZN common energy cut" };
201- Configurable<float > znTimeCut{" znTimeCut" , 2.0 , " ZN time cut" };
200+ Configurable<float > znTimeCut{" znTimeCut" , 2.0 , " ZN time cut (ns)" };
202201 Configurable<bool > cutOccupancy{" cutOccupancy" , true , " cut on collision occupancy?" };
203202 Configurable<float > occupancyCut{" occupancyCut" , 1000.0 , " occupancy cut" };
204203
@@ -814,20 +813,19 @@ struct UpcRhoAnalysis {
814813 if (std::isinf (timeZNC))
815814 timeZNC = -999 ;
816815
817- if (energyCommonZNA <= znCommonEnergyCut && energyCommonZNC <= znCommonEnergyCut ) {
816+ if (std::abs (timeZNA) > znTimeCut && std::abs (timeZNC) > znTimeCut ) {
818817 onon = true ;
819818 neutronClass = 0 ;
820819 }
821- if (energyCommonZNA > znCommonEnergyCut && std::abs (timeZNA) <= znTimeCut && energyCommonZNC <= znCommonEnergyCut ) {
820+ if (std::abs (timeZNA) <= znTimeCut && std::abs (timeZNC) > znTimeCut ) {
822821 xnon = true ;
823822 neutronClass = 1 ;
824823 }
825- if (energyCommonZNA <= znCommonEnergyCut && energyCommonZNC > znCommonEnergyCut && std::abs (timeZNC) <= znTimeCut) {
824+ if (std::abs (timeZNA) > znTimeCut && std::abs (timeZNC) <= znTimeCut) {
826825 onxn = true ;
827826 neutronClass = 2 ;
828827 }
829- if (energyCommonZNA > znCommonEnergyCut && std::abs (timeZNA) <= znTimeCut &&
830- energyCommonZNC > znCommonEnergyCut && std::abs (timeZNC) <= znTimeCut) {
828+ if (std::abs (timeZNA) <= znTimeCut && std::abs (timeZNC) <= znTimeCut) {
831829 xnxn = true ;
832830 neutronClass = 3 ;
833831 }
0 commit comments