CDPP / AMDA_Integration

Commit 063337d892cd2c314f92ba953b670df5b9fa08e1

Authored by Benjamin Renard
1 parent d6bf6ef5
Exists in master and in 66 other branches 10098, 4797, 5390, 6728, 7616, 8528, 8928, 9016Bis, 9049, 9084, 9259, 9326, FER_10400, FER_10663, FER_11100, FER_11242, FER_11500, FER_11586, FER_11588, FER_6265, FER_6860, FER_6951, FER_7618, FER_8455, FER_9629, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, akka-scatter-multi-xparams, amdadev, anr_tempete, cu2022, density_maps, develop, evol-6371, expression-parser-bre, frames-transformation, install-rework, livraison-akka, master_vge, mlplasmas, multiplot, new-save-plot-request, plot-request, plot-tt-catalog, rm_5357, rm_6595, rm_6912, rm_7926, rm_8932, save-other-requests, shared-objects-updater, sum-components-indexes, test-merge, webservice, ws_get_catalog

Add frames transformation support

Showing 2 changed files with 21 additions and 0 deletions   Show diff stats
Inline Side-by-side
config/spiceKernelConfig.xml 0 → 100644
  Diff comments   View file @063337d
... ... @@ -0,0 +1,9 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<spicekernelconfig>
  3 + <datafiles rootPath="/usr/local/data/ORBITS/Kernels/">
  4 + <datafile bodyId="-1" path="general/naif0011.tls"/>
  5 + <datafile bodyId="-1" path="general/de432s.bsp"/>
  6 + <datafile bodyId="-1" path="general/pck00010.tpc"/>
  7 + <datafile bodyId="-1" path="general/frames.tf"/>
  8 + </datafiles>
  9 +</spicekernelconfig>
0 10 \ No newline at end of file
... ...
src/Request/Config/KernelConfigClass.php
  Diff comments   View file @063337d
... ... @@ -11,6 +11,7 @@ class KernelConfigClass
11 11 private static $xsdParameterDir = "parameter/";
12 12 private static $xsdInfoDir = "info/";
13 13 private static $xsdLocalBaseDir = "localbase/";
  14 + private static $xsdSpiceKernelDir = "SpiceKernel/";
14 15  
15 16 private static $propFile = "app.properties";
16 17  
... ... @@ -21,6 +22,8 @@ class KernelConfigClass
21 22  
22 23 private static $logConfigFile = "log4cxx.config";
23 24 private static $plotConfigFile = "plotConfig.xml";
  25 +
  26 + private static $spiceKernelConfigFile = "spiceKernelConfig.xml";
24 27  
25 28 private static $binDir = "bin/";
26 29 private static $pluginDir = "plugin/";
... ... @@ -112,6 +115,12 @@ class KernelConfigClass
112 115 return NEWKERNEL_XSD_DIR.self::$xsdLocalBaseDir.'base.xsd';
113 116 }
114 117  
  118 + public static function getXSDSpiceKernelConfigFilePath()
  119 + {
  120 + return NEWKERNEL_INFO_DIR.self::$xsdSpiceKernelDir.'config.xsd';
  121 + }
  122 +
  123 +
115 124 public static function getDatasetInfoPath()
116 125 {
117 126 return NEWKERNEL_INFO_DIR.self::$datasetInfoDir;
... ... @@ -168,6 +177,9 @@ class KernelConfigClass
168 177 $appProperties["app.localbase.path"] = $localbase_path;
169 178 $appProperties["app.localbase.xsd"] = self::getXSDLocalBaseFilePath();
170 179  
  180 + $appProperties["app.spicekernel.configxsd"] = self::getXSDSpiceKernelConfigFilePath();
  181 + $appProperties["app.spicekernel.configfile"] = INTEGRATION_SRC_DIR.'../config/'.self::$spiceKernelConfigFile;
  182 +
171 183 $appProperties["app.plugin"] = NEWKERNEL_INSTALL_DIR.self::$pluginDir;
172 184 $appProperties["app.process.src"] = $compilation_path.self::$userSrcDir;
173 185 $appProperties["app.process.lib"] = $compilation_path.self::$userLibDir;
... ...