Merge branch 'revert-250303e2' into '21.2'

Revert "Correction against FPE, AsgElectronChargeIDSelectorTool.cxx"

See merge request mociduki/athena!1

Former-commit-id: 65b5a9c4cac20d0f8f9757eea0faf8051ac83393

PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronChargeIDSelectorTool.cxx

@@ -322,7 +322,7 @@ const Root::TResult& AsgElectronChargeIDSelectorTool::calculate( const xAOD::Ele
       SCT += temp_NSCTHits;
       charge += temp_NSCTHits*eg->trackParticle(TPit)->charge();
     }
-    avgCharge_SCTw= SCT!=0 ? eg->charge()*charge/SCT : 0;
+    avgCharge_SCTw= eg->charge()*charge/SCT;
         
     const std::vector<float>&cov= t->definingParametersCovMatrixVec();
     trackqoverpsig= cov[14];