Commit 2d068dd0 authored by Plaszczynski Stephane's avatar Plaszczynski Stephane
Browse files

fix engines in derived classes

parent c906f7da
......@@ -52,7 +52,6 @@ public:
void Set_rfid(double a);
//private:
Engine* engine;
std::string _Experiment_name ;
double _z;
HepVector _data;
......
......@@ -64,25 +64,6 @@ Chi2Data::buildIndex(){
}
}
void
Chi2Data::updateIndex(){
vector<string> nui=requires();
//check nuisances present
for (size_t i=0;i<nui.size();i++){
string n=nui[i];
int j=user_par.Trafo().FindIndex(n);
planck_assert(j>=0,string("Missing parameter ")+n+" requested by " +Chi2Data::name());
index[n]=static_cast<size_t>(j);
}
}
// //default implementation
// std::vector<std::string>
// Chi2Data::requires() const {
// return std::vector<std::string>();
// }
//see the index map
void
Chi2Data::dumpIndex() const{
......
......@@ -84,9 +84,6 @@ protected: // these should be used by sub-classes:
std::map<std::string,size_t> index;
//to reconstruct the index in case requires() changed.
virtual void updateIndex();
double _chi2;
private:
......
......@@ -61,16 +61,6 @@ double JLA_chi2::chi2_eff(const std::vector<double>& par) const
double mu[ _jlalike->size()];
for (int i=0; i < _jlalike->size(); i++)
{
/* DO THIS IN ENGINE ...
double tau;
double vec[ba.bg_size];
int last_index;
background_tau_of_z(&ba, _Z[i], &tau);
background_at_tau(&ba, tau, ba.long_info,
ba.inter_normal, &last_index,
vec);
mu[i] = 5*log10(vec[ba.index_bg_lum_distance]) + 25.;
*/
mu[i] = engine->get_DMod (_Z[i] );
}
......
......@@ -29,7 +29,6 @@ public :
private:
JLALikelihood* _jlalike;
Engine* engine; //when should class be called???
double * _Z;
const char * _dataset_name;
int _verbosity;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment