@@ -1471,31 +1471,31 @@ double GiantBranch::CalculateRemnantNSMassMullerMandel(const double p_COCoreMass
14711471 while (iterations++ < MULLERMANDEL_REMNANT_MASS_MAX_ITERATIONS &&
14721472 (utils::Compare (remnantMass, MULLERMANDEL_MINNS ) < 0 ||
14731473 utils::Compare (remnantMass, OPTIONS ->MaximumNeutronStarMass ()) > 0 ||
1474- utils::Compare (remnantMass, p_HeCoreMass ) > 0 )) {
1474+ utils::Compare (remnantMass, p_COCoreMass ) > 0 )) {
14751475 remnantMass = MULLERMANDEL_MU1 + RAND ->RandomGaussian (MULLERMANDEL_SIGMA1 );
14761476 }
14771477 if (iterations >= MULLERMANDEL_REMNANT_MASS_MAX_ITERATIONS ) // failure to find a solution implies a narrow range; just pick a midpoint in this case
1478- remnantMass = (std::min (OPTIONS ->MaximumNeutronStarMass (), p_HeCoreMass ) + MULLERMANDEL_MINNS ) / 2.0 ;
1478+ remnantMass = (std::min (OPTIONS ->MaximumNeutronStarMass (), p_COCoreMass ) + MULLERMANDEL_MINNS ) / 2.0 ;
14791479 }
14801480 else if (utils::Compare (p_COCoreMass, MULLERMANDEL_M2 ) < 0 ) {
14811481 while (iterations++ < MULLERMANDEL_REMNANT_MASS_MAX_ITERATIONS &&
14821482 (utils::Compare (remnantMass, MULLERMANDEL_MINNS ) < 0 ||
14831483 utils::Compare (remnantMass, OPTIONS ->MaximumNeutronStarMass ()) > 0 ||
1484- utils::Compare (remnantMass, p_HeCoreMass ) > 0 )) {
1484+ utils::Compare (remnantMass, p_COCoreMass ) > 0 )) {
14851485 remnantMass = MULLERMANDEL_MU2A + MULLERMANDEL_MU2B / (MULLERMANDEL_M2 - MULLERMANDEL_M1 ) * (p_COCoreMass - MULLERMANDEL_M1 ) + RAND ->RandomGaussian (MULLERMANDEL_SIGMA2 );
14861486 }
14871487 if (iterations >= MULLERMANDEL_REMNANT_MASS_MAX_ITERATIONS ) // failure to find a solution implies a narrow range; just pick a midpoint in this case
1488- remnantMass = (std::min (OPTIONS ->MaximumNeutronStarMass (), p_HeCoreMass ) + MULLERMANDEL_MINNS ) / 2.0 ;
1488+ remnantMass = (std::min (OPTIONS ->MaximumNeutronStarMass (), p_COCoreMass ) + MULLERMANDEL_MINNS ) / 2.0 ;
14891489 }
14901490 else {
14911491 while (iterations++ < MULLERMANDEL_REMNANT_MASS_MAX_ITERATIONS &&
14921492 (utils::Compare (remnantMass, MULLERMANDEL_MINNS ) < 0 ||
14931493 utils::Compare (remnantMass, OPTIONS ->MaximumNeutronStarMass ()) > 0 ||
1494- utils::Compare (remnantMass, p_HeCoreMass ) > 0 )) {
1494+ utils::Compare (remnantMass, p_COCoreMass ) > 0 )) {
14951495 remnantMass = MULLERMANDEL_MU3A + MULLERMANDEL_MU3B / (MULLERMANDEL_M3 - MULLERMANDEL_M2 ) * (p_COCoreMass - MULLERMANDEL_M2 ) + RAND ->RandomGaussian (MULLERMANDEL_SIGMA3 );
14961496 }
14971497 if (iterations >= MULLERMANDEL_REMNANT_MASS_MAX_ITERATIONS ) // failure to find a solution implies a narrow range; just pick a midpoint in this case
1498- remnantMass = (std::min (OPTIONS ->MaximumNeutronStarMass (), p_HeCoreMass ) + MULLERMANDEL_MINNS ) / 2.0 ;
1498+ remnantMass = (std::min (OPTIONS ->MaximumNeutronStarMass (), p_COCoreMass ) + MULLERMANDEL_MINNS ) / 2.0 ;
14991499 }
15001500 return remnantMass;
15011501}
0 commit comments