Commit e99b2f095793bc1fc7b327ef1876018c16537475
1 parent
2c12f24d
Exists in
master
and in
7 other branches
modif of ballistic params
Showing
7 changed files
with
14 additions
and
18 deletions
Show diff stats
PARAM_DEF/jup_bls_da.xml
... | ... | @@ -2,9 +2,8 @@ |
2 | 2 | <param xml:id="jup_bls_da"> |
3 | 3 | <time_resolution>3600</time_resolution> |
4 | 4 | <get> |
5 | - <amdaParam name="xyz_earth_hci"/> | |
6 | - <amdaParam name="xyz_jupiter_hci"/> | |
5 | + <amdaParam name="xyz_jupiter_hee"/> | |
7 | 6 | </get> |
8 | - <process>RAD2DEG*angle_difference($xyz_jupiter_hci,$xyz_earth_hci)</process> | |
7 | + <process>RAD2DEG*acos($xyz_jupiter_hee[0]/sqrt($xyz_jupiter_hee[0]*$xyz_jupiter_hee[0]+$xyz_jupiter_hee[1]*$xyz_jupiter_hee[1]))*Sign($xyz_jupiter_hee[1])</process> | |
9 | 8 | <output/> |
10 | 9 | </param> |
... | ... |
PARAM_DEF/jup_bls_lag.xml
... | ... | @@ -5,9 +5,8 @@ |
5 | 5 | <amdaParam name="omni_sw_v"/> |
6 | 6 | <amdaParam name="r_jupiter"/> |
7 | 7 | <amdaParam name="r_earth"/> |
8 | - <amdaParam name="xyz_earth_hci"/> | |
9 | - <amdaParam name="xyz_jupiter_hci"/> | |
8 | + <amdaParam name="jup_bls_da"/> | |
10 | 9 | </get> |
11 | - <process>($r_jupiter-$r_earth)/$omni_sw_v*1736.11+angle_difference($xyz_jupiter_hci,$xyz_earth_hci)/0.247439</process> | |
10 | + <process>($r_jupiter-$r_earth)/$omni_sw_v*1736.11+$jup_bls_da/14.177</process> | |
12 | 11 | <output/> |
13 | 12 | </param> |
... | ... |
PARAM_DEF/mars_bls_da.xml
... | ... | @@ -2,9 +2,8 @@ |
2 | 2 | <param xml:id="mars_bls_da"> |
3 | 3 | <time_resolution>3600</time_resolution> |
4 | 4 | <get> |
5 | - <amdaParam name="xyz_earth_hci"/> | |
6 | - <amdaParam name="xyz_mars_hci"/> | |
5 | + <amdaParam name="xyz_mars_hee"/> | |
7 | 6 | </get> |
8 | - <process>RAD2DEG*angle_difference($xyz_mars_hci,$xyz_earth_hci)</process> | |
7 | + <process>RAD2DEG*acos($xyz_mars_hee[0]/sqrt($xyz_mars_hee[0]*$xyz_mars_hee[0]+$xyz_mars_hee[1]*$xyz_mars_hee[1]))*Sign($xyz_mars_hee[1])</process> | |
9 | 8 | <output/> |
10 | 9 | </param> |
... | ... |
PARAM_DEF/mars_bls_lag.xml
... | ... | @@ -5,9 +5,8 @@ |
5 | 5 | <amdaParam name="omni_sw_v"/> |
6 | 6 | <amdaParam name="r_mars"/> |
7 | 7 | <amdaParam name="r_earth"/> |
8 | - <amdaParam name="xyz_earth_hci"/> | |
9 | - <amdaParam name="xyz_mars_hci"/> | |
8 | + <amdaParam name="mars_bls_da"/> | |
10 | 9 | </get> |
11 | - <process>($r_mars-$r_earth)/$omni_sw_v*1736.11+angle_difference($xyz_mars_hci,$xyz_earth_hci)/0.247439</process> | |
10 | + <process>($r_mars-$r_earth)/$omni_sw_v*1736.11+$mars_bls_da/14.177</process> | |
12 | 11 | <output/> |
13 | 12 | </param> |
... | ... |
PARAM_DEF/sat_bls_da.xml
... | ... | @@ -2,9 +2,8 @@ |
2 | 2 | <param xml:id="sat_bls_da"> |
3 | 3 | <time_resolution>3600</time_resolution> |
4 | 4 | <get> |
5 | - <amdaParam name="xyz_earth_hci"/> | |
6 | - <amdaParam name="xyz_saturn_hci"/> | |
5 | + <amdaParam name="xyz_saturn_hee"/> | |
7 | 6 | </get> |
8 | - <process>RAD2DEG*angle_difference($xyz_saturn_hci,$xyz_earth_hci)</process> | |
7 | + <process>RAD2DEG*acos($xyz_saturn_hee[0]/sqrt($xyz_saturn_hee[0]*$xyz_saturn_hee[0]+$xyz_saturn_hee[1]*$xyz_saturn_hee[1]))*Sign($xyz_saturn_hee[1])</process> | |
9 | 8 | <output/> |
10 | 9 | </param> |
... | ... |
PARAM_DEF/sat_bls_lag.xml
... | ... | @@ -5,9 +5,8 @@ |
5 | 5 | <amdaParam name="omni_sw_v"/> |
6 | 6 | <amdaParam name="r_saturn"/> |
7 | 7 | <amdaParam name="r_earth"/> |
8 | - <amdaParam name="xyz_earth_hci"/> | |
9 | - <amdaParam name="xyz_saturn_hci"/> | |
8 | + <amdaParam name="sat_bls_da"/> | |
10 | 9 | </get> |
11 | - <process>($r_saturn-$r_earth)/$omni_sw_v*1736.11+angle_difference($xyz_saturn_hci,$xyz_earth_hci)/0.247439</process> | |
10 | + <process>($r_saturn-$r_earth)/$omni_sw_v*1736.11+$sat_bls_da/14.177</process> | |
12 | 11 | <output/> |
13 | 12 | </param> |
... | ... |