Commit 4c195a2f2faed69b41107db110dca149886e3f59
1 parent
18d6394f
Exists in
juice_jdc
and in
1 other branch
Redefine JUNO / JEDI parameters
Showing
43 changed files
with
126 additions
and
258 deletions
Show diff stats
INTERNAL_PARAM_DEF/jedi_e180_lower_energy_0.xml renamed to INTERNAL_PARAM_DEF/jedi_e180_lower_energy.xml
1 | 1 | <?xml version="1.0"?> |
2 | -<param xml:id="jedi_e180_lower_energy_0"> | |
2 | +<param xml:id="jedi_e180_lower_energy_##lookdir##"> | |
3 | 3 | <get> |
4 | - <amdaParam name="jedi_e180_mode"/> | |
4 | + <vi name='juno:jedi:e180'> | |
5 | + <baseParam name='LowerEnergy'/> | |
6 | + </vi> | |
5 | 7 | </get> |
6 | - <process description="Lower energy for LookDir 0">#getJunoJediLowerEnergy($jedi_e180_mode;0)</process> | |
8 | + <process>$juno_jedi_e180_LowerEnergy[##lookdir##]</process> | |
7 | 9 | <output/> |
8 | 10 | </param> | ... | ... |
INTERNAL_PARAM_DEF/jedi_e180_lower_energy_1.xml renamed to INTERNAL_PARAM_DEF/jedi_e180_upper_energy.xml
1 | 1 | <?xml version="1.0"?> |
2 | -<param xml:id="jedi_e180_lower_energy_1"> | |
2 | +<param xml:id="jedi_e180_upper_energy_##lookdir##"> | |
3 | 3 | <get> |
4 | - <amdaParam name="jedi_e180_mode"/> | |
4 | + <vi name='juno:jedi:e180'> | |
5 | + <baseParam name='UpperEnergy'/> | |
6 | + </vi> | |
5 | 7 | </get> |
6 | - <process description="Lower energy for LookDir 1">#getJunoJediLowerEnergy($jedi_e180_mode;1)</process> | |
8 | + <process>$juno_jedi_e180_UpperEnergy[##lookdir##]</process> | |
7 | 9 | <output/> |
8 | 10 | </param> | ... | ... |
INTERNAL_PARAM_DEF/jedi_e180_upper_energy_0.xml deleted
INTERNAL_PARAM_DEF/jedi_e180_upper_energy_1.xml deleted
INTERNAL_PARAM_DEF/jedi_e180_upper_energy_2.xml deleted
INTERNAL_PARAM_DEF/jedi_e180_upper_energy_3.xml deleted
INTERNAL_PARAM_DEF/jedi_e180_upper_energy_4.xml deleted
INTERNAL_PARAM_DEF/jedi_e180_upper_energy_5.xml deleted
INTERNAL_PARAM_DEF/jedi_e180_lower_energy_2.xml renamed to INTERNAL_PARAM_DEF/jedi_e270_lower_energy.xml
1 | 1 | <?xml version="1.0"?> |
2 | -<param xml:id="jedi_e180_lower_energy_2"> | |
2 | +<param xml:id="jedi_e270_lower_energy_##lookdir##"> | |
3 | 3 | <get> |
4 | - <amdaParam name="jedi_e180_mode"/> | |
4 | + <vi name='juno:jedi:e270'> | |
5 | + <baseParam name='LowerEnergy'/> | |
6 | + </vi> | |
5 | 7 | </get> |
6 | - <process description="Lower energy for LookDir 2">#getJunoJediLowerEnergy($jedi_e180_mode;2)</process> | |
8 | + <process>$juno_jedi_e270_LowerEnergy[##lookdir##]</process> | |
7 | 9 | <output/> |
8 | 10 | </param> | ... | ... |
INTERNAL_PARAM_DEF/jedi_e270_lower_energy_0.xml deleted
INTERNAL_PARAM_DEF/jedi_e270_lower_energy_1.xml deleted
INTERNAL_PARAM_DEF/jedi_e270_lower_energy_2.xml deleted
INTERNAL_PARAM_DEF/jedi_e270_lower_energy_3.xml deleted
INTERNAL_PARAM_DEF/jedi_e270_lower_energy_4.xml deleted
INTERNAL_PARAM_DEF/jedi_e270_lower_energy_5.xml deleted
INTERNAL_PARAM_DEF/jedi_e180_lower_energy_3.xml renamed to INTERNAL_PARAM_DEF/jedi_e270_upper_energy.xml
1 | 1 | <?xml version="1.0"?> |
2 | -<param xml:id="jedi_e180_lower_energy_3"> | |
2 | +<param xml:id="jedi_e270_upper_energy_##lookdir##"> | |
3 | 3 | <get> |
4 | - <amdaParam name="jedi_e180_mode"/> | |
4 | + <vi name='juno:jedi:e270'> | |
5 | + <baseParam name='UpperEnergy'/> | |
6 | + </vi> | |
5 | 7 | </get> |
6 | - <process description="Lower energy for LookDir 3">#getJunoJediLowerEnergy($jedi_e180_mode;3)</process> | |
8 | + <process>$juno_jedi_e270_UpperEnergy[##lookdir##]</process> | |
7 | 9 | <output/> |
8 | 10 | </param> | ... | ... |
INTERNAL_PARAM_DEF/jedi_e270_upper_energy_0.xml deleted
INTERNAL_PARAM_DEF/jedi_e270_upper_energy_1.xml deleted
INTERNAL_PARAM_DEF/jedi_e270_upper_energy_2.xml deleted
INTERNAL_PARAM_DEF/jedi_e270_upper_energy_3.xml deleted
INTERNAL_PARAM_DEF/jedi_e270_upper_energy_4.xml deleted
INTERNAL_PARAM_DEF/jedi_e270_upper_energy_5.xml deleted
INTERNAL_PARAM_DEF/jedi_e180_lower_energy_4.xml renamed to INTERNAL_PARAM_DEF/jedi_e90_lower_energy.xml
1 | 1 | <?xml version="1.0"?> |
2 | -<param xml:id="jedi_e180_lower_energy_4"> | |
2 | +<param xml:id="jedi_e90_lower_energy_##lookdir##"> | |
3 | 3 | <get> |
4 | - <amdaParam name="jedi_e180_mode"/> | |
4 | + <vi name='juno:jedi:e090'> | |
5 | + <baseParam name='LowerEnergy'/> | |
6 | + </vi> | |
5 | 7 | </get> |
6 | - <process description="Lower energy for LookDir 4">#getJunoJediLowerEnergy($jedi_e180_mode;4)</process> | |
8 | + <process>$juno_jedi_e090_LowerEnergy[##lookdir##]</process> | |
7 | 9 | <output/> |
8 | 10 | </param> | ... | ... |
INTERNAL_PARAM_DEF/jedi_e90_lower_energy_0.xml deleted
INTERNAL_PARAM_DEF/jedi_e90_lower_energy_1.xml deleted
INTERNAL_PARAM_DEF/jedi_e90_lower_energy_2.xml deleted
INTERNAL_PARAM_DEF/jedi_e90_lower_energy_3.xml deleted
INTERNAL_PARAM_DEF/jedi_e90_lower_energy_4.xml deleted
INTERNAL_PARAM_DEF/jedi_e90_lower_energy_5.xml deleted
INTERNAL_PARAM_DEF/jedi_e180_lower_energy_5.xml renamed to INTERNAL_PARAM_DEF/jedi_e90_upper_energy.xml
1 | 1 | <?xml version="1.0"?> |
2 | -<param xml:id="jedi_e180_lower_energy_5"> | |
2 | +<param xml:id="jedi_e90_upper_energy_##lookdir##"> | |
3 | 3 | <get> |
4 | - <amdaParam name="jedi_e180_mode"/> | |
4 | + <vi name='juno:jedi:e090'> | |
5 | + <baseParam name='UpperEnergy'/> | |
6 | + </vi> | |
5 | 7 | </get> |
6 | - <process description="Lower energy for LookDir 5">#getJunoJediLowerEnergy($jedi_e180_mode;5)</process> | |
8 | + <process>$juno_jedi_e090_UpperEnergy[##lookdir##]</process> | |
7 | 9 | <output/> |
8 | 10 | </param> | ... | ... |
INTERNAL_PARAM_DEF/jedi_e90_upper_energy_0.xml deleted
INTERNAL_PARAM_DEF/jedi_e90_upper_energy_1.xml deleted
INTERNAL_PARAM_DEF/jedi_e90_upper_energy_2.xml deleted
INTERNAL_PARAM_DEF/jedi_e90_upper_energy_3.xml deleted
INTERNAL_PARAM_DEF/jedi_e90_upper_energy_4.xml deleted
INTERNAL_PARAM_DEF/jedi_e90_upper_energy_5.xml deleted
ParamTemplateList.xml
... | ... | @@ -354,6 +354,36 @@ |
354 | 354 | <argument key="lookdir" name="Look Direction" type="generated-list" minkey="0" maxkey="5" nametpl="Look Dir. ##key##" default="0"/> |
355 | 355 | </arguments> |
356 | 356 | </paramTemplate> |
357 | + <paramTemplate paramId="jedi_e90_lower_energy" fileName="jedi_e90_lower_energy_##lookdir##"> | |
358 | + <arguments> | |
359 | + <argument key="lookdir" name="Look Direction" type="generated-list" minkey="0" maxkey="5" nametpl="Look Dir. ##key##" default="0"/> | |
360 | + </arguments> | |
361 | + </paramTemplate> | |
362 | + <paramTemplate paramId="jedi_e90_upper_energy" fileName="jedi_e90_upper_energy_##lookdir##"> | |
363 | + <arguments> | |
364 | + <argument key="lookdir" name="Look Direction" type="generated-list" minkey="0" maxkey="5" nametpl="Look Dir. ##key##" default="0"/> | |
365 | + </arguments> | |
366 | + </paramTemplate> | |
367 | + <paramTemplate paramId="jedi_e180_lower_energy" fileName="jedi_e180_lower_energy_##lookdir##"> | |
368 | + <arguments> | |
369 | + <argument key="lookdir" name="Look Direction" type="generated-list" minkey="0" maxkey="5" nametpl="Look Dir. ##key##" default="0"/> | |
370 | + </arguments> | |
371 | + </paramTemplate> | |
372 | + <paramTemplate paramId="jedi_e180_upper_energy" fileName="jedi_e180_upper_energy_##lookdir##"> | |
373 | + <arguments> | |
374 | + <argument key="lookdir" name="Look Direction" type="generated-list" minkey="0" maxkey="5" nametpl="Look Dir. ##key##" default="0"/> | |
375 | + </arguments> | |
376 | + </paramTemplate> | |
377 | + <paramTemplate paramId="jedi_e270_lower_energy" fileName="jedi_e270_lower_energy_##lookdir##"> | |
378 | + <arguments> | |
379 | + <argument key="lookdir" name="Look Direction" type="generated-list" minkey="0" maxkey="5" nametpl="Look Dir. ##key##" default="0"/> | |
380 | + </arguments> | |
381 | + </paramTemplate> | |
382 | + <paramTemplate paramId="jedi_e270_upper_energy" fileName="jedi_e270_upper_energy_##lookdir##"> | |
383 | + <arguments> | |
384 | + <argument key="lookdir" name="Look Direction" type="generated-list" minkey="0" maxkey="5" nametpl="Look Dir. ##key##" default="0"/> | |
385 | + </arguments> | |
386 | + </paramTemplate> | |
357 | 387 | <paramTemplate paramId="jedi_i90_flux" fileName="jedi_i90_flux_##lookdir##"> |
358 | 388 | <arguments> |
359 | 389 | <argument key="lookdir" name="Look Direction" type="generated-list" minkey="0" maxkey="5" nametpl="Look Dir. ##key##" default="0"/> | ... | ... |