Supernova.cpp   Supernova.cpp 
skipping to change at line 181 skipping to change at line 181
if (sntype.contains("II", Qt::CaseSensitive)) if (sntype.contains("II", Qt::CaseSensitive))
{ {
// Type II // Type II
if (peakJD<=currentJD) if (peakJD<=currentJD)
{ {
vmag = maxMagnitude; vmag = maxMagnitude;
if (deltaJD>0 && deltaJD<=30) if (deltaJD>0 && deltaJD<=30)
vmag = maxMagnitude + 0.05 * deltaJD; vmag = maxMagnitude + 0.05 * deltaJD;
if (deltaJD>30 && deltaJD<=80) if (deltaJD>30 && deltaJD<=80)
vmag = maxMagnitude + 0.013 * deltaJD + 1.5; vmag = maxMagnitude + 0.013 * (deltaJD - 30) + 1.5;
if (deltaJD>80) if (deltaJD>80 && deltaJD<=100)
vmag = maxMagnitude + 0.05 * deltaJD + 2.15; vmag = maxMagnitude + 0.075 * (deltaJD - 80)
+ 2.15;
if (deltaJD>100)
vmag = maxMagnitude + 0.025 * (deltaJD - 100
) + 3.65;
} }
else else
{ {
if (deltaJD<=20) if (deltaJD<=20)
vmag = maxMagnitude + 0.75 * deltaJD; vmag = maxMagnitude + 0.75 * deltaJD;
} }
} }
else else
{ {
// Type I // Type I
if (peakJD<=currentJD) if (peakJD<=currentJD)
{ {
vmag = maxMagnitude; vmag = maxMagnitude;
if (deltaJD>0 && deltaJD<=25) if (deltaJD>0 && deltaJD<=25)
vmag = maxMagnitude + 0.1 * deltaJD; vmag = maxMagnitude + 0.1 * deltaJD;
if (deltaJD>25) if (deltaJD>25)
vmag = maxMagnitude + 0.016 * deltaJD + 2.5; vmag = maxMagnitude + 0.016 * (deltaJD - 25) + 2.5;
} }
else else
{ {
if (deltaJD<=15) if (deltaJD<=15)
vmag = maxMagnitude + 1.13 * deltaJD; vmag = maxMagnitude + 1.13 * deltaJD;
} }
} }
 End of changes. 3 change blocks. 
4 lines changed or deleted 9 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/