Revision 692 branches/merge-trunk-davef/src/nh99/mod_sd.cpp

mod_sd.cpp (revision 692)
44 44
  initial_params::xinit(x); // get the number of active parameters
45 45

  
46 46
  initial_params::restore_start_phase();
47
#if defined(USE_LAPLACE)
48
  if (lapprox  && lapprox->no_re_ders_flag)
49
  {
50
    initial_params::set_inactive_only_random_effects();
51
  }
52
#endif
47 53
  int nvar1=initial_params::nvarcalc(); // get the number of active parameters
48 54
  int num_sdrep_types=stddev_params::num_stddev_params +
49 55
    initial_params::num_active_calc();
......
116 122
  int check=initial_params::stddev_scale(scale,x);
117 123
  double lndet=-ln_det(S,sgn)-2.0*sum(log(scale));
118 124
  initial_params::set_active_random_effects(); 
125
#if defined(USE_LAPLACE)
126
  if (lapprox  && lapprox->no_re_ders_flag)
127
  {
128
    initial_params::set_inactive_only_random_effects();
129
  }
130
#endif
119 131
  //int nvar1=initial_params::nvarcalc(); 
120 132
  dvector diag(1,nvar1+ndvar);
121 133
  dvector tmp(1,nvar1+ndvar);

Also available in: Unified diff