deleting prob vector from PCAEnergyParametrization and adding size check in...

deleting prob vector from PCAEnergyParametrization and adding size check in EnergyBinParametrization


Former-commit-id: e54a59a35e7b77ca865f55677ec2180cfdc72496

Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSPCAEnergyParametrization.h

@@ -51,8 +51,6 @@ class TFCSPCAEnergyParametrization:public TFCSEnergyParametrization
   std::vector<TVectorD*>    m_Gauss_rms;
   std::vector<std::vector<TFCS1DFunction*> > m_cumulative;
   
-  std::vector<float> m_pcabinprob;
-  
   int m_numberpcabins;
   
   ClassDefOverride(TFCSPCAEnergyParametrization,1)  //TFCSPCAEnergyParametrization

Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSEnergyBinParametrization.cxx

@@ -91,6 +91,13 @@ void TFCSEnergyBinParametrization::load_pdgid_Ekin_bin_probability_from_file(int
   if(!pcabinprobvector)
   {
    ATH_MSG_ERROR("TFCSEnergyBinParametrization::"<<prob_object_name<<" is null");
+   return;
+  }
+  
+  if((unsigned int)pcabinprobvector->GetNoElements()!=m_pdgid_Ebin_probability[id].size())
+  {
+    ATH_MSG_ERROR("TFCSEnergyBinParametrization::set_pdgid_Ekin_bin_probability(): size of prob array does not match! in.size()="<<pcabinprobvector->GetNoElements()<<" instance="<<m_pdgid_Ebin_probability[id].size());
+    return;
   }
   
   float* prob  =pcabinprobvector->GetMatrixArray();