Skip to content

Commit

Permalink
Merge branch 'master' into satellites/omm-2458
Browse files Browse the repository at this point in the history
  • Loading branch information
@A-j-K
A-j-K authored Aug 25, 2023
2 parents 1a12894 + 2f31bac commit 4ff648e
Show file tree
Hide file tree
Showing 14 changed files with 292 additions and 6,728 deletions.
6,504 changes: 0 additions & 6,504 deletions data/ssystem_1000comets.ini
View file

Large diffs are not rendered by default.

108 changes: 33 additions & 75 deletions data/ssystem_major.ini
View file

Large diffs are not rendered by default.

34 changes: 3 additions & 31 deletions data/ssystem_minor.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
# - dust_widthfactor=1.50 (comets only)
# - dust_lengthfactor=0.4 (comets only)
# - dust_brightnessfactor=1.5 (comets only)
# Further keys to get rid of:
# - orbit_visualization_period: Objects on Kepler orbits compute that themselves.

# From 0.20.0 on, coord_func defaults to kepler_orbit which replaces both ell_orbit and comet_orbit entries.
# For compatibility reasons, we must keep coord_func=comet_orbit in ssystem_minor.ini
# Source for discovery circumstances:
Expand Down Expand Up @@ -62,7 +65,6 @@ orbit_Inclination = 6.03387
orbit_MeanAnomaly = 162.57657
orbit_MeanMotion = 0.82489482
orbit_SemiMajorAxis = 1.1259964
orbit_visualization_period = 436.3678886544901
radius = 0.246
slope_parameter = -0.08
spec_b = B
Expand Down Expand Up @@ -125,7 +127,6 @@ orbit_Inclination = 28.21037
orbit_MeanAnomaly = 219.49271
orbit_MeanMotion = 0.00350666
orbit_SemiMajorAxis = 42.9082304
orbit_visualization_period = 104217.7286462600
radius = 3130
tex_map = haumea.png
type = dwarf planet
Expand All @@ -147,7 +148,6 @@ orbit_Inclination = 43.76068
orbit_MeanAnomaly = 208.76911
orbit_MeanMotion = 0.00175204
orbit_SemiMajorAxis = 68.1460186
orbit_visualization_period = 203270.0112332937
radius = 1300
rot_periode = 8
type = dwarf planet
Expand All @@ -169,7 +169,6 @@ orbit_Inclination = 29.01844
orbit_MeanAnomaly = 167.57375
orbit_MeanMotion = 0.0032364
orbit_SemiMajorAxis = 45.2648796
orbit_visualization_period = 113054.2239533638
radius = 1400
type = dwarf planet

Expand All @@ -191,7 +190,6 @@ orbit_Inclination = 22.79955
orbit_MeanAnomaly = 352.54819
orbit_MeanMotion = 0.88043904
orbit_SemiMajorAxis = 1.0781268
orbit_visualization_period = 408.8529703828165
radius = 2
type = asteroid

Expand All @@ -212,7 +210,6 @@ orbit_Inclination = 5.86618
orbit_MeanAnomaly = 232.3502
orbit_MeanMotion = 0.75833785
orbit_SemiMajorAxis = 1.1909519
orbit_visualization_period = 473.8835763858008
radius = 0.435
slope_parameter = 0.15
spec_b = Cg
Expand Down Expand Up @@ -254,7 +251,6 @@ orbit_Inclination = 21.521
orbit_MeanAnomaly = 275.59189
orbit_MeanMotion = 0.00318294
orbit_SemiMajorAxis = 45.7702913
orbit_visualization_period = 113532.0637269260
radius = 717
type = cubewano

Expand Down Expand Up @@ -316,7 +312,6 @@ orbit_Inclination = 22.21646
orbit_MeanAnomaly = 59.37385
orbit_MeanMotion = 0.55821848
orbit_SemiMajorAxis = 1.4608308
orbit_visualization_period = 644.9621322925108
radius = 1.85
spec_b = Sr
spec_t = SQ
Expand All @@ -339,7 +334,6 @@ orbit_Inclination = 41.20493
orbit_MeanAnomaly = 122.45499
orbit_MeanMotion = 0.37824234
orbit_SemiMajorAxis = 1.8936045
orbit_visualization_period = 951.7454221872209
radius = 4.24
spec_b = S
type = asteroid
Expand Down Expand Up @@ -404,7 +398,6 @@ orbit_Inclination = 10.58634
orbit_MeanAnomaly = 17.21569
orbit_MeanMotion = 0.21411523
orbit_SemiMajorAxis = 2.7671817
orbit_visualization_period = 1682.186076755994
radius = 469.7
rot_pole_de = 66.764
rot_pole_ra = 291.418
Expand Down Expand Up @@ -433,7 +426,6 @@ orbit_Inclination = 17.17282
orbit_MeanAnomaly = 117.26818
orbit_MeanMotion = 0.00351068
orbit_SemiMajorAxis = 42.8754681
orbit_visualization_period = 103180.3887398598
radius = 450
type = cubewano

Expand Down Expand Up @@ -506,7 +498,6 @@ orbit_Inclination = 20.90083
orbit_MeanAnomaly = 39.33551
orbit_MeanMotion = 0.98733146
orbit_SemiMajorAxis = 0.9988357
orbit_visualization_period = 365.0763426626145
radius = 1
type = asteroid

Expand Down Expand Up @@ -544,7 +535,6 @@ orbit_Inclination = 13.55513
orbit_MeanAnomaly = 236.76346
orbit_MeanMotion = 0.00399087
orbit_SemiMajorAxis = 39.3632784
orbit_visualization_period = 90980.99828561733
radius = 597
type = plutino

Expand All @@ -565,7 +555,6 @@ orbit_Inclination = 3.06388
orbit_MeanAnomaly = 347.05108
orbit_MeanMotion = 0.25946323
orbit_SemiMajorAxis = 2.4345508
orbit_visualization_period = 1387.3965133277534
radius = 48
slope_parameter = 0.11
spec_b = Xk
Expand All @@ -589,7 +578,6 @@ orbit_Inclination = 30.903849999999998
orbit_MeanAnomaly = 104.40425
orbit_MeanMotion = 0.0017947
orbit_SemiMajorAxis = 67.061821699999996
orbit_visualization_period = 200359.5922844264
radius = 1367
slope_parameter = 0.15
tex_map = 2007OR10.png
Expand All @@ -612,7 +600,6 @@ orbit_Inclination = 23.352229999999999
orbit_MeanAnomaly = 343.11759999999998
orbit_MeanMotion = 0.0015738900000000001
orbit_SemiMajorAxis = 73.195991599999999
orbit_visualization_period = 229391.7676963096
radius = 717
slope_parameter = 0.15
type = scattered disc object
Expand Down Expand Up @@ -663,7 +650,6 @@ orbit_Inclination = 1.62126
orbit_MeanAnomaly = 114.48064
orbit_MeanMotion = 0.64678631
orbit_SemiMajorAxis = 1.3242262
orbit_visualization_period = 556.52701021557664
radius = 1
rot_pole_de = -66.30
rot_pole_ra = 90.53
Expand All @@ -689,7 +675,6 @@ orbit_Inclination = 6.74183
orbit_MeanAnomaly = 358.59002
orbit_MeanMotion = 0.22872901
orbit_SemiMajorAxis = 2.6480238
orbit_visualization_period = 1576.283856987046
radius = 30
slope_parameter = 0.14999999999999999
spec_b = Cb
Expand Down Expand Up @@ -732,7 +717,6 @@ orbit_Inclination = 9.93142
orbit_MeanAnomaly = 310.41278
orbit_MeanMotion = 0.27118535
orbit_SemiMajorAxis = 2.3638789
orbit_visualization_period = 1327.3049880151268
radius = 11
rot_pole_de = -62
rot_pole_ra = 91
Expand Down Expand Up @@ -780,7 +764,6 @@ orbit_Inclination = 34.92703
orbit_MeanAnomaly = 357.84942
orbit_MeanMotion = 0.21383118
orbit_SemiMajorAxis = 2.7696317
orbit_visualization_period = 1686.537085119438
radius = 272.5
rot_pole_de = -3
rot_pole_ra = 33
Expand All @@ -807,7 +790,6 @@ orbit_Inclination = 17.71045
orbit_MeanAnomaly = 228.71674
orbit_MeanMotion = 0.00364156
orbit_SemiMajorAxis = 41.8418576
orbit_visualization_period = 98653.52761933634
radius = 625
type = cubewano
Expand Down Expand Up @@ -847,7 +829,6 @@ orbit_Inclination = 22.27353
orbit_MeanAnomaly = 196.50611
orbit_MeanMotion = 0.68755988
orbit_SemiMajorAxis = 1.2713419
orbit_visualization_period = 523.5184875226332
radius = 3.125
spec_b = B
spec_t = F
Expand Down Expand Up @@ -909,7 +890,6 @@ orbit_Inclination = 19.80378
orbit_MeanAnomaly = 75.42368
orbit_MeanMotion = 0.98901691
orbit_SemiMajorAxis = 0.9977006
orbit_visualization_period = 363.9986951530281
radius = 1.0355
spec_b = Q
type = asteroid
Expand All @@ -931,7 +911,6 @@ orbit_Inclination = 15.475
orbit_MeanAnomaly = 11.51259
orbit_MeanMotion = 0.00399335
orbit_SemiMajorAxis = 39.3469362
orbit_visualization_period = 91401.12515814671
radius = 360
type = plutino
Expand All @@ -952,7 +931,6 @@ orbit_Inclination = 12.99067
orbit_MeanAnomaly = 351.82413
orbit_MeanMotion = 0.22589353
orbit_SemiMajorAxis = 2.6701369
orbit_visualization_period = 1592.375560647722
radius = 123.298
slope_parameter = 0.32
spec_b = Sk
Expand Down Expand Up @@ -997,7 +975,6 @@ orbit_Inclination = 10.82783
orbit_MeanAnomaly = 110.77765
orbit_MeanMotion = 0.55977061
orbit_SemiMajorAxis = 1.4581291
orbit_visualization_period = 643.0194421757885
radius = 8.42
rot_pole_de = 17.22
rot_pole_ra = 11.35
Expand Down Expand Up @@ -1048,7 +1025,6 @@ orbit_Inclination = 7.13926
orbit_MeanAnomaly = 115.13302
orbit_MeanMotion = 0.27133009
orbit_SemiMajorAxis = 2.3630382
orbit_visualization_period = 1325.314867254217
radius = 262.7
rot_pole_de = 42.235
rot_pole_ra = 309.031
Expand Down Expand Up @@ -1078,7 +1054,6 @@ orbit_Inclination = 7.99129
orbit_MeanAnomaly = 294.4204
orbit_MeanMotion = 0.00344866
orbit_SemiMajorAxis = 43.3879596
orbit_visualization_period = 104638.6456476030
radius = 1037
type = cubewano
Expand Down Expand Up @@ -1139,7 +1114,6 @@ orbit_Inclination = 11.93034
orbit_MeanAnomaly = 358.46965
orbit_MeanMotion = 8.024e-05
orbit_SemiMajorAxis = 532.372351
orbit_visualization_period = 4059763.931035112
radius = 1643
slope_parameter = 0.15
tex_map = sedna.png
Expand All @@ -1162,7 +1136,6 @@ orbit_Inclination = 20.56758
orbit_MeanAnomaly = 184.36708
orbit_MeanMotion = 0.00402866
orbit_SemiMajorAxis = 39.11669
orbit_visualization_period = 90497.54584826222
radius = 1190
slope_parameter = 0.15
type = plutino
Expand Down Expand Up @@ -1215,7 +1188,6 @@ orbit_Inclination = 3.33927
orbit_MeanAnomaly = 280.45871
orbit_MeanMotion = 1.11199237
orbit_SemiMajorAxis = 0.9227163
orbit_visualization_period = 323.6957174709954
radius = 1
slope_parameter = 0.15
spec_b = Sq
Expand Down
10 changes: 3 additions & 7 deletions guide/app_ssystem_ini.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ \subsubsection{Planet section}
name=Jupiter
type=planet
coord_func=jupiter_special
orbit_visualization_period=4331.87
orbit_Period=4331.87

atmosphere=1
albedo=0.51
Expand Down Expand Up @@ -87,7 +87,7 @@ \subsubsection{Planet section}
\item[type] Mandatory for planets: \value{planet}
\item[parent]=Sun. The body which this object is running around. Default: \texttt{Sun}
\item[coord\_func] The planet positions are all computed with a dedicated function (VSOP87 or DE43x).
\item[orbit\_visualization\_period] number of (earth) days for how
\item[orbit\_Period] number of (earth) days for how
long the orbit should be made visible. Typically Stellarium shows
one orbit line. The orbit slowly drifts, however.

Expand Down Expand Up @@ -191,7 +191,6 @@ \subsubsection{Moon section}
orbit_MeanLongitude=224.7924893552550000
orbit_Period=0.5016370462116355
orbit_SemiMajorAxis=181994.8658358799
# orbit_visualization_period=0.5016370462116355

absolute_magnitude=7.4
albedo=0.09
Expand Down Expand Up @@ -230,8 +229,6 @@ \subsubsection{Moon section}
\item[orbit\_MeanLongitude]
\item[orbit\_Period] [days]
\item[orbit\_SemiMajorAxis] $a$ [km]
\item[orbit\_visualization\_period] [days] Defaults to \texttt{orbit\_Period} to show orbit as closed line.
This is in fact only useful in case of special functions for positioning where \texttt{orbit\_Period} is not given.

\item[radius] Equator radius, km.
\item[oblateness] Flattening of the polar
Expand Down Expand Up @@ -352,7 +349,6 @@ \subsection{File ssystem\_minor.ini}
\item[orbit\_Eccentricity] $e=0$ circular, $0<e<1$ elliptic, $e=1$ parabolic, $e>1$ hyperbolic
\item[orbit\_Inclination] $i$ [degrees] inclination against J2000 ecliptic
\item[orbit\_SemiMajorAxis] $a$ [AU]
\item[orbit\_visualization\_period] [days] %TODO does that default to sth meaningful? Do we need it at all?
\end{description}
The other parameters are like those for the major planets.

Expand All @@ -376,7 +372,7 @@ \subsubsection{Minor Planet section}
orbit_Eccentricity=0.0887401
orbit_Inclination=7.14043
orbit_SemiMajorAxis=2.3617933
orbit_visualization_period=1325.46
orbit_good=1325.46

color=1., 1., 1.
halo=true
Expand Down
8 changes: 2 additions & 6 deletions plugins/SolarSystemEditor/src/SolarSystemEditor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -431,13 +431,13 @@ bool SolarSystemEditor::addFromSolarSystemConfigurationFile(QString filePath)
}
minorBodies.sync();
qDebug() << "Minor groups now: " << minorBodies.childGroups();
qDebug() << "Checking for stupid General group.";
//qDebug() << "Checking for stupid General group.";
// There may be a generic group "General" in the updated file, created from comments. We must remove it.
if (minorBodies.childGroups().contains("General"))
{
minorBodies.remove("General");
qDebug() << "Minor groups after fix now: " << minorBodies.childGroups();
}
qDebug() << "Minor groups after fix now: " << minorBodies.childGroups();
minorBodies.sync();

solarSystem->reloadPlanets();
Expand Down Expand Up @@ -1086,10 +1086,6 @@ SsoElements SolarSystemEditor::readMpcOneLineMinorPlanetElements(QString oneLine
result.insert("orbit_good", 1000); // default validity for osculating elements for parabolic/hyperbolic comets, days
}

// add period for visualization of orbit
if (semiMajorAxis>0)
result.insert("orbit_visualization_period", KeplerOrbit::calculateSiderealPeriod(semiMajorAxis, 1.));

// 2:3 resonance to Neptune [https://en.wikipedia.org/wiki/Plutino]
if (static_cast<int>(semiMajorAxis) == 39)
objectType = "plutino";
Expand Down
Loading

0 comments on commit 4ff648e

Please sign in to comment.