CDPP / AMDA_Kernel

Commit 3caf58ee6204ec1e7c7b1c4707b990ec131930d9

Authored by Hacene SI HADJ MOHAND
1 parent bf54b7d4
Exists in master and in 84 other branches 10038, 10098, 5390, 5770, 6728, 7616, 7811, 7875, 8034_7628, 8038, 8041, 8045_8044, 8295, 8459, 8528, 8928, 9016, 9016Bis, 9017, 9017-new, 9049, 9084, 9259, 9326, 9347, 9383, 9719, 9719.new, AllLegends, CDF_ISTP, CDF_ISTP_HOPEFULLY_ALL_WORKING, FER_10400, FER_10412, FER_10663, FER_10765, FER_11000, FER_11100, FER_11242, FER_11277, FER_11500, FER_11537, FER_11588, FER_11651, FER_19836, FER_5344, FER_6031, FER_6598, FER_6966, FER_7318, FER_7618, FER_7857, FER_8455, FER_9629, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, JUNO_JEDI, MAZ_10936, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, SpeasyGet, amdadev, amdadev_test, cu2022, das2, density_maps, develop, evol_9042, expression-parser-bre, feature/9259, frames-transformation, pickle, rm_6015, rm_6912, rm_7926, rm_8050, rm_8932, shue, shue97, test-merge, ubuntu

compil mais marche pas

Showing 33 changed files with 106 additions and 91 deletions   Show diff stats
Inline Side-by-side
src/ExternLib/Boxcar/AMDAPlugin.cc
  Diff comments   View file @3caf58e
... ... @@ -71,8 +71,8 @@ extern "C" const char* getPluginVersion() {
71 71 /**
72 72 Tells us to register our functionality to an engine kernel
73 73 */
74   -extern "C" void registerPlugin(AMDA::Plugins::PluginManager & /*pm*/, std::string& plugingPath) {
  74 +extern "C" void registerPlugin(AMDA::Plugins::PluginManager & pm) {
75 75 ProcessFactory factProcessBoxcarProcess = boost::factory<BoxcarProcess*>();
76 76 ServicesServer::getInstance()->addProcessFactory("boxcar", factProcessBoxcarProcess);
77   - ServicesServer::getInstance()->linkProcessWithPlugin("boxcar", plugingPath);
  77 + ServicesServer::getInstance()->linkProcessWithPlugin("boxcar", pm.getCurrentPluginPath());
78 78 }
... ...
src/ExternLib/Deriv/AMDAPlugin.cc
  Diff comments   View file @3caf58e
... ... @@ -74,10 +74,10 @@ extern &quot;C&quot; const char* getPluginVersion()
74 74 /**
75 75 Tells us to register our functionality to an engine kernel
76 76 */
77   -extern "C" void registerPlugin(AMDA::Plugins::PluginManager & /*pm*/, std::string& plugingPath)
  77 +extern "C" void registerPlugin(AMDA::Plugins::PluginManager & pm)
78 78 {
79 79 ProcessFactory factProcessDeriv = boost::factory<ProcessDeriv*>();
80 80 ServicesServer::getInstance()->addProcessFactory("deriv", factProcessDeriv);
81   - ServicesServer::getInstance()->linkProcessWithPlugin("deriv", plugingPath);
  81 + ServicesServer::getInstance()->linkProcessWithPlugin("deriv", pm.getCurrentPluginPath());
82 82  
83 83 }
... ...
src/ExternLib/EnergyBounds/AMDAPlugin.cc
  Diff comments   View file @3caf58e
... ... @@ -101,8 +101,8 @@ extern &quot;C&quot; const char* getPluginVersion()
101 101 /**
102 102 Tells us to register our functionality to an engine kernel
103 103 */
104   -extern "C" void registerPlugin(AMDA::Plugins::PluginManager & /*pm*/, std::string& plugingPath)
  104 +extern "C" void registerPlugin(AMDA::Plugins::PluginManager & pm)
105 105 {
106 106 ServicesServer::getInstance()->addServiceImpl<CalibrationInfoWriter::CalibrationInfoProcess>("energy_bounds",&energy_bounds);
107   - ServicesServer::getInstance()->linkProcessWithPlugin("energy_bounds", plugingPath);
  107 + ServicesServer::getInstance()->linkProcessWithPlugin("energy_bounds", pm.getCurrentPluginPath());
108 108 }
... ...
src/ExternLib/FramesTransformation/AMDAPlugin.cc
  Diff comments   View file @3caf58e
... ... @@ -74,9 +74,9 @@ extern &quot;C&quot; const char* getPluginVersion()
74 74 /**
75 75 Tells us to register our functionality to an engine kernel
76 76 */
77   -extern "C" void registerPlugin(AMDA::Plugins::PluginManager & /*pm*/, std::string& plugingPath)
  77 +extern "C" void registerPlugin(AMDA::Plugins::PluginManager & pm)
78 78 {
79 79 ProcessFactory factProcessFramesTransformation = boost::factory<ProcessFramesTransformation*>();
80 80 ServicesServer::getInstance()->addProcessFactory("framesTransformation", factProcessFramesTransformation);
81   - ServicesServer::getInstance()->linkProcessWithPlugin("framesTransformation", plugingPath, std::string& plugingPath);
  81 + ServicesServer::getInstance()->linkProcessWithPlugin("framesTransformation", pm.getCurrentPluginPath());
82 82 }
... ...
src/ExternLib/GetClbInfo/AMDAPlugin.cc
  Diff comments   View file @3caf58e
... ... @@ -74,9 +74,9 @@ extern &quot;C&quot; const char* getPluginVersion()
74 74 /**
75 75 Tells us to register our functionality to an engine kernel
76 76 */
77   -extern "C" void registerPlugin(AMDA::Plugins::PluginManager & /*pm*/, std::string& plugingPath)
  77 +extern "C" void registerPlugin(AMDA::Plugins::PluginManager & pm)
78 78 {
79 79 ProcessFactory factProcessGetClbInfo = boost::factory<AMDA::GetClbInfo::GetClbInfoProcess*>();
80 80 ServicesServer::getInstance()->addProcessFactory("getClbInfo", factProcessGetClbInfo);
81   - ServicesServer::getInstance()->linkProcessWithPlugin("getClbInfo", plugingPath);
  81 + ServicesServer::getInstance()->linkProcessWithPlugin("getClbInfo", pm.getCurrentPluginPath());
82 82 }
... ...
src/ExternLib/GetClbInfoByIndex/AMDAPlugin.cc
  Diff comments   View file @3caf58e
... ... @@ -74,9 +74,9 @@ extern &quot;C&quot; const char* getPluginVersion()
74 74 /**
75 75 Tells us to register our functionality to an engine kernel
76 76 */
77   -extern "C" void registerPlugin(AMDA::Plugins::PluginManager & /*pm*/, std::string& plugingPath)
  77 +extern "C" void registerPlugin(AMDA::Plugins::PluginManager & pm)
78 78 {
79 79 ProcessFactory factProcessGetClbInfoByIndex = boost::factory<AMDA::GetClbInfoByIndex::GetClbInfoByIndexProcess*>();
80 80 ServicesServer::getInstance()->addProcessFactory("getClbInfoByIndex", factProcessGetClbInfoByIndex);
81   - ServicesServer::getInstance()->linkProcessWithPlugin("getClbInfoByIndex", plugingPath);
  81 + ServicesServer::getInstance()->linkProcessWithPlugin("getClbInfoByIndex", pm.getCurrentPluginPath());
82 82 }
... ...
src/ExternLib/GetJunoJediEnergy/AMDAPlugin.cc
  Diff comments   View file @3caf58e
... ... @@ -74,7 +74,7 @@ extern &quot;C&quot; const char* getPluginVersion()
74 74 /**
75 75 Tells us to register our functionality to an engine kernel
76 76 */
77   -extern "C" void registerPlugin(AMDA::Plugins::PluginManager & /*pm*/, std::string& plugingPath)
  77 +extern "C" void registerPlugin(AMDA::Plugins::PluginManager & pm)
78 78 {
79 79 ProcessFactory factProcessGetJunoJediLowerEnergy = boost::factory<AMDA::JunoJedi::GetJunoJediLowerEnergyProcess*>();
80 80 ServicesServer::getInstance()->addProcessFactory("getJunoJediLowerEnergy", factProcessGetJunoJediLowerEnergy);
... ... @@ -83,5 +83,5 @@ extern &quot;C&quot; void registerPlugin(AMDA::Plugins::PluginManager &amp; /*pm*/, std::strin
83 83  
84 84 ServicesServer::getInstance()->addProcessFactory("getJunoJediUpperEnergy", factProcessGetJunoJediUpperEnergy);
85 85  
86   - ServicesServer::getInstance()->linkProcessWithPlugin("getJunoJediUpperEnergy", plugingPath);
  86 + ServicesServer::getInstance()->linkProcessWithPlugin("getJunoJediUpperEnergy", pm.getCurrentPluginPath());
87 87 }
... ...
src/ExternLib/GetMavenStaticEnergy/AMDAPlugin.cc
  Diff comments   View file @3caf58e
... ... @@ -74,10 +74,10 @@ extern &quot;C&quot; const char* getPluginVersion()
74 74 /**
75 75 Tells us to register our functionality to an engine kernel
76 76 */
77   -extern "C" void registerPlugin(AMDA::Plugins::PluginManager & /*pm*/, std::string& plugingPath)
  77 +extern "C" void registerPlugin(AMDA::Plugins::PluginManager & pm)
78 78 {
79 79 ProcessFactory factProcessGetMavenStaticEnergy = boost::factory<AMDA::MavenStatic::GetMavenStaticEnergyProcess*>();
80 80 ServicesServer::getInstance()->addProcessFactory("getMavenStaticEnergy", factProcessGetMavenStaticEnergy);
81   - ServicesServer::getInstance()->linkProcessWithPlugin("getMavenStaticEnergy", plugingPath);
  81 + ServicesServer::getInstance()->linkProcessWithPlugin("getMavenStaticEnergy", pm.getCurrentPluginPath());
82 82  
83 83 }
... ...
src/ExternLib/Merge/AMDAPlugin.cc
  Diff comments   View file @3caf58e
... ... @@ -74,9 +74,9 @@ extern &quot;C&quot; const char* getPluginVersion()
74 74 /**
75 75 Tells us to register our functionality to an engine kernel
76 76 */
77   -extern "C" void registerPlugin(AMDA::Plugins::PluginManager & /*pm*/, std::string& plugingPath)
  77 +extern "C" void registerPlugin(AMDA::Plugins::PluginManager & pm)
78 78 {
79 79 ProcessFactory factProcessMerge = boost::factory<AMDA::Merge::MergeProcess*>();
80 80 ServicesServer::getInstance()->addProcessFactory("merge", factProcessMerge);
81   - ServicesServer::getInstance()->linkProcessWithPlugin("merge", plugingPath);
  81 + ServicesServer::getInstance()->linkProcessWithPlugin("merge", pm.getCurrentPluginPath());
82 82 }
... ...
src/ExternLib/Morschhauser/AMDAPlugin.cc
  Diff comments   View file @3caf58e
... ... @@ -75,13 +75,13 @@ extern &quot;C&quot; const char* getPluginVersion()
75 75 /**
76 76 Tells us to register our functionality to an engine kernel
77 77 */
78   -extern "C" void registerPlugin(AMDA::Plugins::PluginManager & /*pm*/, std::string& plugingPath)
  78 +extern "C" void registerPlugin(AMDA::Plugins::PluginManager & pm)
79 79 {
80 80 ProcessFactory factProcessMorschhauserBFieldProcess = boost::factory<MorschhauserBfieldProcess*>();
81 81 ServicesServer::getInstance()->addProcessFactory("morschhauser_bfield", factProcessMorschhauserBFieldProcess);
82   - ServicesServer::getInstance()->linkProcessWithPlugin("morschhauser_bfield", plugingPath);
  82 + ServicesServer::getInstance()->linkProcessWithPlugin("morschhauser_bfield", pm.getCurrentPluginPath());
83 83  
84 84 ProcessFactory factProcessMorschhauserBMagProcess = boost::factory<MorschhauserBmagProcess*>();
85 85 ServicesServer::getInstance()->addProcessFactory("morschhauser_bmag", factProcessMorschhauserBMagProcess);
86   - ServicesServer::getInstance()->linkProcessWithPlugin("morschhauser_bmag", plugingPath);
  86 + ServicesServer::getInstance()->linkProcessWithPlugin("morschhauser_bmag", pm.getCurrentPluginPath());
87 87 }
... ...
src/ExternLib/PlotCurves/AMDAPlugin.cc
  Diff comments   View file @3caf58e
... ... @@ -92,7 +92,7 @@ extern &quot;C&quot; const char* getPluginVersion()
92 92 /**
93 93 Tells us to register our functionality to an engine kernel
94 94 */
95   -extern "C" void registerPlugin(AMDA::Plugins::PluginManager & /*pm*/, , std::string& /*plugingPath*/)
  95 +extern "C" void registerPlugin(AMDA::Plugins::PluginManager & /*pm*/)
96 96 {
97 97 ServicesServer::getInstance()->addServiceImpl<CurveFunctionWriter::CurveFunctionProcess>("bowshock",&bowshock);
98 98 ServicesServer::getInstance()->addServiceImpl<CurveFunctionWriter::CurveFunctionProcess>("bowshock_farris",&bowshock_farris);
... ...
src/ExternLib/SlidingAverage/AMDAPlugin.cc
  Diff comments   View file @3caf58e
... ... @@ -74,9 +74,9 @@ extern &quot;C&quot; const char* getPluginVersion()
74 74 /**
75 75 Tells us to register our functionality to an engine kernel
76 76 */
77   -extern "C" void registerPlugin(AMDA::Plugins::PluginManager & /*pm*/, std::string& plugingPath)
  77 +extern "C" void registerPlugin(AMDA::Plugins::PluginManager & pm)
78 78 {
79 79 ProcessFactory factProcessSlidingAverageProcess = boost::factory<SlidingAverageProcess*>();
80 80 ServicesServer::getInstance()->addProcessFactory("sliding_average", factProcessSlidingAverageProcess);
81   - ServicesServer::getInstance()->linkProcessWithPlugin("sliding_average", plugingPath);
  81 + ServicesServer::getInstance()->linkProcessWithPlugin("sliding_average", pm.getCurrentPluginPath());
82 82 }
... ...
src/ExternLib/StatisticFunctions/AMDAPlugin.cc
  Diff comments   View file @3caf58e
... ... @@ -27,48 +27,49 @@ extern &quot;C&quot; const char* getPluginVersion() {
27 27 /**
28 28 Tells us to register our functionality to an engine kernel
29 29 */
30   -extern "C" void registerPlugin(AMDA::Plugins::PluginManager & /*pm*/, std::string& plugingPath) {
  30 +extern "C" void registerPlugin(AMDA::Plugins::PluginManager & pm) {
  31 + std::string pluginPath=pm.getCurrentPluginPath();
31 32 ProcessFactory factProcessMinFunc = boost::factory<ProcessMinFunc*>();
32 33 ServicesServer::getInstance()->addProcessFactory("min", factProcessMinFunc);
33   - ServicesServer::getInstance()->linkProcessWithPlugin("min", plugingPath);
  34 + ServicesServer::getInstance()->linkProcessWithPlugin("min", pluginPath);
34 35  
35 36 ProcessFactory factProcessMinSmFunc = boost::factory<ProcessMinSmFunc*>();
36 37 ServicesServer::getInstance()->addProcessFactory("min_sm", factProcessMinSmFunc);
37   - ServicesServer::getInstance()->linkProcessWithPlugin("min_sm", plugingPath);
  38 + ServicesServer::getInstance()->linkProcessWithPlugin("min_sm", pluginPath);
38 39  
39 40 ProcessFactory factProcessMaxFunc = boost::factory<ProcessMaxFunc*>();
40 41 ServicesServer::getInstance()->addProcessFactory("max", factProcessMaxFunc);
41   - ServicesServer::getInstance()->linkProcessWithPlugin("max", plugingPath);
  42 + ServicesServer::getInstance()->linkProcessWithPlugin("max", pluginPath);
42 43  
43 44 ProcessFactory factProcessMaxSmFunc = boost::factory<ProcessMaxSmFunc*>();
44 45 ServicesServer::getInstance()->addProcessFactory("max_sm", factProcessMaxSmFunc);
45   - ServicesServer::getInstance()->linkProcessWithPlugin("max_sm", plugingPath);
  46 + ServicesServer::getInstance()->linkProcessWithPlugin("max_sm", pluginPath);
46 47  
47 48 ProcessFactory factProcessVarFunc = boost::factory<ProcessVarFunc*>();
48 49 ServicesServer::getInstance()->addProcessFactory("var", factProcessVarFunc);
49   - ServicesServer::getInstance()->linkProcessWithPlugin("var", plugingPath);
  50 + ServicesServer::getInstance()->linkProcessWithPlugin("var", pluginPath);
50 51  
51 52 ProcessFactory factProcessVarSmFunc = boost::factory<ProcessVarSmFunc*>();
52 53 ServicesServer::getInstance()->addProcessFactory("var_sm", factProcessVarSmFunc);
53   - ServicesServer::getInstance()->linkProcessWithPlugin("var_sm", plugingPath);
  54 + ServicesServer::getInstance()->linkProcessWithPlugin("var_sm", pluginPath);
54 55  
55 56 ProcessFactory factProcessRmsFunc = boost::factory<ProcessRmsFunc*>();
56 57 ServicesServer::getInstance()->addProcessFactory("rms", factProcessRmsFunc);
57   - ServicesServer::getInstance()->linkProcessWithPlugin("rms", plugingPath);
  58 + ServicesServer::getInstance()->linkProcessWithPlugin("rms", pluginPath);
58 59  
59 60 ProcessFactory factProcessRmsSmFunc = boost::factory<ProcessRmsSmFunc*>();
60 61 ServicesServer::getInstance()->addProcessFactory("rms_sm", factProcessRmsSmFunc);
61   - ServicesServer::getInstance()->linkProcessWithPlugin("rms_sm", plugingPath);
  62 + ServicesServer::getInstance()->linkProcessWithPlugin("rms_sm", pluginPath);
62 63  
63 64 ProcessFactory factProcessSkewFunc = boost::factory<ProcessSkewFunc*>();
64 65 ServicesServer::getInstance()->addProcessFactory("skew", factProcessSkewFunc);
65   - ServicesServer::getInstance()->linkProcessWithPlugin("skew", plugingPath);
  66 + ServicesServer::getInstance()->linkProcessWithPlugin("skew", pluginPath);
66 67  
67 68 ProcessFactory factProcessSkewSmFunc = boost::factory<ProcessSkewSmFunc*>();
68 69 ServicesServer::getInstance()->addProcessFactory("skew_sm", factProcessSkewSmFunc);
69   - ServicesServer::getInstance()->linkProcessWithPlugin("skew_sm", plugingPath);
  70 + ServicesServer::getInstance()->linkProcessWithPlugin("skew_sm", pluginPath);
70 71  
71 72 ProcessFactory factProcessMedianFunc = boost::factory<ProcessMedianFunc*>();
72 73 ServicesServer::getInstance()->addProcessFactory("median", factProcessMedianFunc);
73   - ServicesServer::getInstance()->linkProcessWithPlugin("median", plugingPath);
  74 + ServicesServer::getInstance()->linkProcessWithPlugin("median", pluginPath);
74 75 }
... ...
src/ExternLib/StatisticProcesses/AMDAPlugin.cc
  Diff comments   View file @3caf58e
... ... @@ -78,52 +78,53 @@ extern &quot;C&quot; const char* getPluginVersion() {
78 78 /**
79 79 Tells us to register our functionality to an engine kernel
80 80 */
81   -extern "C" void registerPlugin(AMDA::Plugins::PluginManager & /*pm*/, std::string& plugingPath) {
  81 +extern "C" void registerPlugin(AMDA::Plugins::PluginManager & pm) {
  82 + std::string pluginPath = pm.getCurrentPluginPath();
82 83 StatisticProcessFactory factMinProcess = boost::factory<AMDA::Statistic::MinMaxMean::MinStatisticProcess*>();
83 84 ServicesServer::getInstance()->addStatisticProcessFactory("min", factMinProcess);
84   - ServicesServer::getInstance()->linkStatisticProcessWithPlugin("min", plugingPath);
  85 + ServicesServer::getInstance()->linkStatisticProcessWithPlugin("min", pluginPath);
85 86  
86 87 StatisticProcessFactory factMaxProcess = boost::factory<AMDA::Statistic::MinMaxMean::MaxStatisticProcess*>();
87 88 ServicesServer::getInstance()->addStatisticProcessFactory("max", factMaxProcess);
88   - ServicesServer::getInstance()->linkStatisticProcessWithPlugin("max", plugingPath);
  89 + ServicesServer::getInstance()->linkStatisticProcessWithPlugin("max", pluginPath);
89 90  
90 91 StatisticProcessFactory factMeanProcess = boost::factory<AMDA::Statistic::MinMaxMean::MeanStatisticProcess*>();
91 92 ServicesServer::getInstance()->addStatisticProcessFactory("mean", factMeanProcess);
92   - ServicesServer::getInstance()->linkStatisticProcessWithPlugin("mean", plugingPath);
  93 + ServicesServer::getInstance()->linkStatisticProcessWithPlugin("mean", pluginPath);
93 94  
94 95 StatisticProcessFactory factRMSProcess = boost::factory<AMDA::Statistic::MinMaxMean::RMSStatisticProcess*>();
95 96 ServicesServer::getInstance()->addStatisticProcessFactory("RMS", factRMSProcess);
96   - ServicesServer::getInstance()->linkStatisticProcessWithPlugin("RMS", plugingPath);
  97 + ServicesServer::getInstance()->linkStatisticProcessWithPlugin("RMS", pluginPath);
97 98  
98 99 StatisticProcessFactory factMinVarProcess = boost::factory<AMDA::Statistic::MinVar::MinVarStatisticProcess*>();
99 100 ServicesServer::getInstance()->addStatisticProcessFactory("minvar", factMinVarProcess);
100   - ServicesServer::getInstance()->linkStatisticProcessWithPlugin("minvar", plugingPath);
  101 + ServicesServer::getInstance()->linkStatisticProcessWithPlugin("minvar", pluginPath);
101 102  
102 103 StatisticProcessFactory factMedianProcess = boost::factory<AMDA::Statistic::MinMaxMean::MedianStatisticProcess*>();
103 104 ServicesServer::getInstance()->addStatisticProcessFactory("median", factMedianProcess);
104   - ServicesServer::getInstance()->linkStatisticProcessWithPlugin("median", plugingPath);
  105 + ServicesServer::getInstance()->linkStatisticProcessWithPlugin("median", pluginPath);
105 106  
106 107 StatisticProcessFactory factVarianceProcess = boost::factory<AMDA::Statistic::MinMaxMean::VarianceStatisticProcess*>();
107 108 ServicesServer::getInstance()->addStatisticProcessFactory("variance", factVarianceProcess);
108   - ServicesServer::getInstance()->linkStatisticProcessWithPlugin("variance", plugingPath);
  109 + ServicesServer::getInstance()->linkStatisticProcessWithPlugin("variance", pluginPath);
109 110  
110 111 StatisticProcessFactory factSkewnessProcess = boost::factory<AMDA::Statistic::MinMaxMean::SkewnessStatisticProcess*>();
111 112 ServicesServer::getInstance()->addStatisticProcessFactory("skewness", factSkewnessProcess);
112   - ServicesServer::getInstance()->linkStatisticProcessWithPlugin("skewness", plugingPath);
  113 + ServicesServer::getInstance()->linkStatisticProcessWithPlugin("skewness", pluginPath);
113 114  
114 115 StatisticProcessFactory factKurtosisProcess = boost::factory<AMDA::Statistic::MinMaxMean::KurtosisStatisticProcess*>();
115 116 ServicesServer::getInstance()->addStatisticProcessFactory("kurtosis", factKurtosisProcess);
116   - ServicesServer::getInstance()->linkStatisticProcessWithPlugin("kurtosis", plugingPath);
  117 + ServicesServer::getInstance()->linkStatisticProcessWithPlugin("kurtosis", pluginPath);
117 118  
118 119 StatisticProcessFactory factCountProcess = boost::factory<AMDA::Statistic::Count::CountStatisticProcess*>();
119 120 ServicesServer::getInstance()->addStatisticProcessFactory("count", factCountProcess);
120   - ServicesServer::getInstance()->linkStatisticProcessWithPlugin("count", plugingPath);
  121 + ServicesServer::getInstance()->linkStatisticProcessWithPlugin("count", pluginPath);
121 122  
122 123 StatisticProcessFactory factCountNotNanProcess = boost::factory<AMDA::Statistic::Count::CountNotNanStatisticProcess*>();
123 124 ServicesServer::getInstance()->addStatisticProcessFactory("countNotNan", factCountNotNanProcess);
124   - ServicesServer::getInstance()->linkStatisticProcessWithPlugin("countNotNan", plugingPath);
  125 + ServicesServer::getInstance()->linkStatisticProcessWithPlugin("countNotNan", pluginPath);
125 126  
126 127 StatisticProcessFactory factBoolProcess = boost::factory<AMDA::Statistic::CountBool::CountBoolStatisticProcess*>();
127 128 ServicesServer::getInstance()->addStatisticProcessFactory("countTrue", factBoolProcess);
128   - ServicesServer::getInstance()->linkStatisticProcessWithPlugin("countTrue", plugingPath);
  129 + ServicesServer::getInstance()->linkStatisticProcessWithPlugin("countTrue", pluginPath);
129 130 }
... ...
src/ExternLib/TimeShifted/AMDAPlugin.cc
  Diff comments   View file @3caf58e
... ... @@ -74,9 +74,9 @@ extern &quot;C&quot; const char* getPluginVersion()
74 74 /**
75 75 Tells us to register our functionality to an engine kernel
76 76 */
77   -extern "C" void registerPlugin(AMDA::Plugins::PluginManager & /*pm*/, std::string& plugingPath)
  77 +extern "C" void registerPlugin(AMDA::Plugins::PluginManager & pm)
78 78 {
79 79 ProcessFactory factProcessTimeShifted = boost::factory<ProcessTimeShifted*>();
80 80 ServicesServer::getInstance()->addProcessFactory("timeShift", factProcessTimeShifted);
81   - ServicesServer::getInstance()->linkProcessWithPlugin("timeShift", plugingPath);
  81 + ServicesServer::getInstance()->linkProcessWithPlugin("timeShift", pm.getCurrentPluginPath());
82 82 }
... ...
src/ExternLib/Tsyganenko96/AMDAPlugin.cc
  Diff comments   View file @3caf58e
... ... @@ -27,12 +27,12 @@ extern &quot;C&quot; const char* getPluginVersion() {
27 27 /**
28 28 Tells us to register our functionality to an engine kernel
29 29 */
30   -extern "C" void registerPlugin(AMDA::Plugins::PluginManager & /*pm*/, std::string& plugingPath) {
  30 +extern "C" void registerPlugin(AMDA::Plugins::PluginManager & pm) {
31 31 ProcessFactory factProcessTsyganenko96GSM = boost::factory<ProcessTsyganenko96GSM*>();
32 32 ServicesServer::getInstance()->addProcessFactory("tsyganenko_96", factProcessTsyganenko96GSM);
33   - ServicesServer::getInstance()->linkProcessWithPlugin("tsyganenko_96", plugingPath);
  33 + ServicesServer::getInstance()->linkProcessWithPlugin("tsyganenko_96", pm.getCurrentPluginPath());
34 34  
35 35 ProcessFactory factProcessTsyganenko96GSE = boost::factory<ProcessTsyganenko96GSE*>();
36 36 ServicesServer::getInstance()->addProcessFactory("tsyganenko_96_gse", factProcessTsyganenko96GSE);
37   - ServicesServer::getInstance()->linkProcessWithPlugin("tsyganenko_96_gse", plugingPath);
  37 + ServicesServer::getInstance()->linkProcessWithPlugin("tsyganenko_96_gse", pm.getCurrentPluginPath());
38 38 }
... ...
src/ExternLib/mexvex_els_decode/AMDAPlugin.cc
  Diff comments   View file @3caf58e
... ... @@ -28,13 +28,13 @@ extern &quot;C&quot; const char* getPluginVersion()
28 28 /**
29 29 Tells us to register our functionality to an engine kernel
30 30 */
31   -extern "C" void registerPlugin(AMDA::Plugins::PluginManager & /*pm*/ , std::string& plugingPath)
  31 +extern "C" void registerPlugin(AMDA::Plugins::PluginManager & pm)
32 32 {
33 33 ProcessFactory factProcessMexElsDecode = boost::factory<ProcessMexVexElsDecode*>();
34 34 ServicesServer::getInstance()->addProcessFactory("mex_els_decode", factProcessMexElsDecode);
35   - ServicesServer::getInstance()->linkProcessWithPlugin("mex_els_decode", plugingPath);
  35 + ServicesServer::getInstance()->linkProcessWithPlugin("mex_els_decode", pm.getCurrentPluginPath());
36 36  
37 37 ProcessFactory factProcessVexElsDecode = boost::factory<ProcessMexVexElsDecode*>();
38 38 ServicesServer::getInstance()->addProcessFactory("vex_els_decode", factProcessVexElsDecode);
39   - ServicesServer::getInstance()->linkProcessWithPlugin("vex_els_decode", plugingPath);
  39 + ServicesServer::getInstance()->linkProcessWithPlugin("vex_els_decode", pm.getCurrentPluginPath());
40 40 }
... ...
src/ExternLib/sum_into_table_indexes/AMDAPlugin.cc
  Diff comments   View file @3caf58e
... ... @@ -74,9 +74,9 @@ extern &quot;C&quot; const char* getPluginVersion()
74 74 /**
75 75 Tells us to register our functionality to an engine kernel
76 76 */
77   -extern "C" void registerPlugin(AMDA::Plugins::PluginManager & /*pm*/ , std::string& plugingPath)
  77 +extern "C" void registerPlugin(AMDA::Plugins::PluginManager & pm)
78 78 {
79 79 ProcessFactory factProcessSumIntoTableIndexes = boost::factory<ProcessSumIntoTableIndexes*>();
80 80 ServicesServer::getInstance()->addProcessFactory("sum_into_table_indexes", factProcessSumIntoTableIndexes);
81   - ServicesServer::getInstance()->linkProcessWithPlugin("sum_into_table_indexes", plugingPath);
  81 + ServicesServer::getInstance()->linkProcessWithPlugin("sum_into_table_indexes", pm.getCurrentPluginPath());
82 82 }
... ...
src/ExternLib/sum_into_table_range/AMDAPlugin.cc
  Diff comments   View file @3caf58e
... ... @@ -74,9 +74,9 @@ extern &quot;C&quot; const char* getPluginVersion()
74 74 /**
75 75 Tells us to register our functionality to an engine kernel
76 76 */
77   -extern "C" void registerPlugin(AMDA::Plugins::PluginManager & /*pm*/ , std::string& plugingPath)
  77 +extern "C" void registerPlugin(AMDA::Plugins::PluginManager & pm)
78 78 {
79 79 ProcessFactory factProcessSumIntoTableRange = boost::factory<ProcessSumIntoTableRange*>();
80 80 ServicesServer::getInstance()->addProcessFactory("sum_into_table_range", factProcessSumIntoTableRange);
81   - ServicesServer::getInstance()->linkProcessWithPlugin("sum_into_table_range", plugingPath);
  81 + ServicesServer::getInstance()->linkProcessWithPlugin("sum_into_table_range", pm.getCurrentPluginPath());
82 82 }
... ...
src/ExternLib/ttcat_to_param/AMDAPlugin.cc
  Diff comments   View file @3caf58e
... ... @@ -74,9 +74,9 @@ extern &quot;C&quot; const char* getPluginVersion()
74 74 /**
75 75 Tells us to register our functionality to an engine kernel
76 76 */
77   -extern "C" void registerPlugin(AMDA::Plugins::PluginManager & /*pm*/, std::string& plugingPath)
  77 +extern "C" void registerPlugin(AMDA::Plugins::PluginManager & pm)
78 78 {
79 79 ProcessFactory factProcessTTCatToParam = boost::factory<ProcessTTCatToParam*>();
80 80 ServicesServer::getInstance()->addProcessFactory("ttcat_to_param", factProcessTTCatToParam);
81   - ServicesServer::getInstance()->linkProcessWithPlugin("ttcat_to_param", plugingPath);
  81 + ServicesServer::getInstance()->linkProcessWithPlugin("ttcat_to_param", pm.getCurrentPluginPath());
82 82 }
... ...
src/InternLib/AMDAPlugin.cc
  Diff comments   View file @3caf58e
... ... @@ -74,17 +74,18 @@ extern &quot;C&quot; const char* getPluginVersion() {
74 74 /**
75 75 Tells us to register our functionality to an engine kernel
76 76 */
77   -extern "C" void registerPlugin(AMDA::Plugins::PluginManager & /*pm*/, std::string& plugingPath) {
  77 +extern "C" void registerPlugin(AMDA::Plugins::PluginManager& pm) {
  78 + std::string pluginPath = pm.getCurrentPluginPath();
78 79 ProcessFactory factProcessStandard = boost::factory<ProcessStandard*>();
79 80 ProcessFactory factProcessSamplingClassic = boost::factory<ProcessSamplingClassic*>();
80 81 ProcessFactory factProcessSamplingUnderRefParam = boost::factory<ProcessSamplingUnderRefParam*>();
81 82  
82 83 ServicesServer::getInstance()->addProcessFactory("standard", factProcessStandard);
83   - ServicesServer::getInstance()->linkProcessWithPlugin("standard", plugingPath);
  84 + ServicesServer::getInstance()->linkProcessWithPlugin("standard", pluginPath);
84 85  
85 86 ServicesServer::getInstance()->addProcessFactory("sampling_classic", factProcessSamplingClassic);
86   - ServicesServer::getInstance()->linkProcessWithPlugin("sampling_classic", plugingPath);
  87 + ServicesServer::getInstance()->linkProcessWithPlugin("sampling_classic", pluginPath);
87 88  
88 89 ServicesServer::getInstance()->addProcessFactory("sampling_under_refparam", factProcessSamplingUnderRefParam);
89   - ServicesServer::getInstance()->linkProcessWithPlugin("sampling_under_refparam", plugingPath);
  90 + ServicesServer::getInstance()->linkProcessWithPlugin("sampling_under_refparam", pluginPath);
90 91 }
... ...
src/ParamGetImpl/ConstantInterface/AMDAPlugin.cc
  Diff comments   View file @3caf58e
... ... @@ -48,12 +48,12 @@ extern &quot;C&quot; const char* getPluginVersion()
48 48 /**
49 49 * Tells us to register our functionality to an engine kernel
50 50 */
51   -extern "C" void registerPlugin(AMDA::Plugins::PluginManager & /*pm*/, std::string& plugingPath)
  51 +extern "C" void registerPlugin(AMDA::Plugins::PluginManager & pm)
52 52 {
53 53 ParamGetFactory fact = boost::factory<AMDA::ConstantInterface::ParamGetConstant*>();
54 54 ServicesServer *servicesServer = ServicesServer::getInstance();
55 55 servicesServer->addParamGetFactory("CONSTANT", fact);
56   - servicesServer->linkParamGetWithPlugin("CONSTANT", plugingPath);
  56 + servicesServer->linkParamGetWithPlugin("CONSTANT", pm.getCurrentPluginPath());
57 57 XMLParameterConfigurator* lXMLConf = dynamic_cast<XMLParameterConfigurator*>(servicesServer->getConfigurator().get());
58 58 lXMLConf->addNodeParser("param/get/constant",AMDA::XMLConfigurator::NodeCfgSPtr(new AMDA::XMLParameterConfigurator::GetConstantNode));
59 59 }
... ...
src/ParamGetImpl/DDServerInterface/AMDAPlugin.cc
  Diff comments   View file @3caf58e
... ... @@ -49,12 +49,12 @@ extern &quot;C&quot; const char* getPluginVersion()
49 49 /**
50 50 * Tells us to register our functionality to an engine kernel
51 51 */
52   -extern "C" void registerPlugin(AMDA::Plugins::PluginManager & /*pm*/, std::string& plugingPath)
  52 +extern "C" void registerPlugin(AMDA::Plugins::PluginManager & pm)
53 53 {
54 54 ParamGetFactory fact = boost::factory<ParamGetDDBase*>();
55 55 ServicesServer *servicesServer = ServicesServer::getInstance();
56 56 servicesServer->addParamGetFactory("DDBASE", fact);
57   - servicesServer->linkParamGetWithPlugin("DDBASE", plugingPath);
  57 + servicesServer->linkParamGetWithPlugin("DDBASE", pm.getCurrentPluginPath());
58 58 XMLParameterConfigurator* lXMLConf = dynamic_cast<XMLParameterConfigurator*>(servicesServer->getConfigurator().get());
59 59 lXMLConf->addNodeParser("param/get/vi",AMDA::XMLConfigurator::NodeCfgSPtr(new GetDDBaseNode));
60 60 }
... ...
src/ParamGetImpl/LocalFileInterface/AMDAPlugin.cc
  Diff comments   View file @3caf58e
... ... @@ -49,12 +49,12 @@ extern &quot;C&quot; const char* getPluginVersion()
49 49 /**
50 50 * Tells us to register our functionality to an engine kernel
51 51 */
52   -extern "C" void registerPlugin(AMDA::Plugins::PluginManager & /*pm*/, std::string& plugingPath)
  52 +extern "C" void registerPlugin(AMDA::Plugins::PluginManager & pm)
53 53 {
54 54 ParamGetFactory fact = boost::factory<AMDA::LocalFileInterface::ParamGetLocalFile*>();
55 55 ServicesServer *servicesServer = ServicesServer::getInstance();
56 56 servicesServer->addParamGetFactory("LOCALFILE", fact);
57   - servicesServer->linkParamGetWithPlugin("LOCALFILE", plugingPath);
  57 + servicesServer->linkParamGetWithPlugin("LOCALFILE", pm.getCurrentPluginPath());
58 58 XMLParameterConfigurator* lXMLConf = dynamic_cast<XMLParameterConfigurator*>(servicesServer->getConfigurator().get());
59 59 lXMLConf->addNodeParser("param/get/localvi",AMDA::XMLConfigurator::NodeCfgSPtr(new AMDA::XMLParameterConfigurator::GetLocalFileNode));
60 60 }
... ...
src/ParamOutputImpl/DataMining/AMDAPlugin.cc
  Diff comments   View file @3caf58e
... ... @@ -51,7 +51,7 @@ extern &quot;C&quot; const char* getPluginVersion()
51 51 /**
52 52 Tells us to register our functionality to an engine kernel
53 53 */
54   -extern "C" void registerPlugin(AMDA::Plugins::PluginManager & /*pm*/, std::string& plugingPath)
  54 +extern "C" void registerPlugin(AMDA::Plugins::PluginManager& pm)
55 55 {
56 56 AMDA::XMLRequest::XMLRequestParser* lXMLRequestParser = ServicesServer::getInstance()->getService<AMDA::XMLRequest::XMLRequestParser*>();
57 57 if (lXMLRequestParser) {
... ... @@ -60,7 +60,7 @@ extern &quot;C&quot; void registerPlugin(AMDA::Plugins::PluginManager &amp; /*pm*/, std::strin
60 60  
61 61 XMLParameterConfigurator* lXMLConf = dynamic_cast<XMLParameterConfigurator*>(ServicesServer::getInstance()->getConfigurator().get());
62 62 lXMLConf->addNodeParser("param/output/dataMining",AMDA::XMLConfigurator::NodeCfgSPtr(new DataMiningNode(ParamOutputDataMining::PRIORITY::PARAM)));
63   - ServicesServer::getInstance()->linkParamOutputsWithPlugin("dataMining", plugingPath);
  63 + ServicesServer::getInstance()->linkParamOutputsWithPlugin("dataMining", pm.getCurrentPluginPath());
64 64 }
65 65  
66 66 /**
... ...
src/ParamOutputImpl/Download/AMDAPlugin.cc
  Diff comments   View file @3caf58e
... ... @@ -81,15 +81,16 @@ extern &quot;C&quot; const char* getPluginVersion()
81 81 /**
82 82 Tells us to register our functionality to an engine kernel
83 83 */
84   -extern "C" void registerPlugin(AMDA::Plugins::PluginManager & /*pm*/ , std::string& plugingPath)
  84 +extern "C" void registerPlugin(AMDA::Plugins::PluginManager & pm)
85 85 {
86 86 //ParamOutputFactory fact = boost::factory<ParamOutputASCIIFile*>();
87 87 //ServicesServer::getInstance()->addParamOutputFactory(std::string("ASCII_FILE"),boost::bind(boost::value_factory<ParamOutputASCIIFile>(),_1));
  88 + std::string pluginPath = pm.getCurrentPluginPath();
88 89 AMDA::XMLRequest::XMLRequestParser* lXMLRequestParser = ServicesServer::getInstance()->getService<AMDA::XMLRequest::XMLRequestParser*>();
89 90 if (lXMLRequestParser) {
90 91 lXMLRequestParser->addNodeParser("request/outputs/download",AMDA::XMLConfigurator::NodeCfgSPtr(new AMDA::ParamOutputImpl::Download::DownloadNode));
91 92 }
92   - ServicesServer::getInstance()->linkParamOutputsWithPlugin("download",plugingPath);
  93 + ServicesServer::getInstance()->linkParamOutputsWithPlugin("download", pluginPath);
93 94  
94 95 }
95 96  
... ...
src/ParamOutputImpl/IntervalTrue/AMDAPlugin.cc
  Diff comments   View file @3caf58e
... ... @@ -82,13 +82,13 @@ extern &quot;C&quot; const char* getPluginVersion()
82 82 /**
83 83 Tells us to register our functionality to an engine kernel
84 84 */
85   -extern "C" void registerPlugin(AMDA::Plugins::PluginManager & /*pm*/, std::string& plugingPath)
  85 +extern "C" void registerPlugin(AMDA::Plugins::PluginManager &pm)
86 86 {
87 87 AMDA::XMLRequest::XMLRequestParser* lXMLRequestParser = ServicesServer::getInstance()->getService<AMDA::XMLRequest::XMLRequestParser*>();
88 88 if (lXMLRequestParser) {
89 89 lXMLRequestParser->addNodeParser("request/outputs/intervalTrue",AMDA::XMLConfigurator::NodeCfgSPtr(new OutputIntervalTrueNode));
90 90 }
91   - ServicesServer::getInstance()->linkParamOutputsWithPlugin("intervalTrue", plugingPath);
  91 + ServicesServer::getInstance()->linkParamOutputsWithPlugin("intervalTrue", pm.getCurrentPluginPath());
92 92 }
93 93  
94 94 /**
... ...
src/ParamOutputImpl/Plot/AMDAPlugin.cc
  Diff comments   View file @3caf58e
... ... @@ -81,13 +81,13 @@ extern &quot;C&quot; const char* getPluginVersion()
81 81 /**
82 82 Tells us to register our functionality to an engine kernel
83 83 */
84   -extern "C" void registerPlugin(AMDA::Plugins::PluginManager & /*pm*/, std::string& plugingPath)
  84 +extern "C" void registerPlugin(AMDA::Plugins::PluginManager & pm)
85 85 {
86 86 AMDA::XMLRequest::XMLRequestParser* lXMLRequestParser = ServicesServer::getInstance()->getService<AMDA::XMLRequest::XMLRequestParser*>();
87 87 if (lXMLRequestParser) {
88 88 lXMLRequestParser->addNodeParser("request/outputs/plot",AMDA::XMLConfigurator::NodeCfgSPtr(new plot::PlotNode));
89 89 }
90   - ServicesServer::getInstance()->linkParamOutputsWithPlugin("plot", plugingPath);
  90 + ServicesServer::getInstance()->linkParamOutputsWithPlugin("plot", pm.getCurrentPluginPath());
91 91  
92 92 }
93 93  
... ...
src/ParamOutputImpl/Statistic/AMDAPlugin.cc
  Diff comments   View file @3caf58e
... ... @@ -51,13 +51,13 @@ extern &quot;C&quot; const char* getPluginVersion()
51 51 /**
52 52 Tells us to register our functionality to an engine kernel
53 53 */
54   -extern "C" void registerPlugin(AMDA::Plugins::PluginManager & /*pm*/, std::string& plugingPath)
  54 +extern "C" void registerPlugin(AMDA::Plugins::PluginManager & pm)
55 55 {
56 56 AMDA::XMLRequest::XMLRequestParser* lXMLRequestParser = ServicesServer::getInstance()->getService<AMDA::XMLRequest::XMLRequestParser*>();
57 57 if (lXMLRequestParser) {
58 58 lXMLRequestParser->addNodeParser("request/outputs/statistic",AMDA::XMLConfigurator::NodeCfgSPtr(new StatisticNode()));
59 59 }
60   - ServicesServer::getInstance()->linkParamOutputsWithPlugin("statistic", plugingPath);
  60 + ServicesServer::getInstance()->linkParamOutputsWithPlugin("statistic", pm.getCurrentPluginPath());
61 61 }
62 62  
63 63 /**
... ...
src/Parameters/ServicesServer.hh
  Diff comments   View file @3caf58e
... ... @@ -199,19 +199,19 @@ namespace AMDA {
199 199  
200 200 // link Process with the corresponding Pluging
201 201  
202   - void linkProcessWithPlugin(std::string &process, std::string&pluginPath) {
  202 + void linkProcessWithPlugin(std::string process, std::string pluginPath) {
203 203 _processPlugingMap[process] = pluginPath;
204 204 }
205 205  
206   - void linkStatisticProcessWithPlugin(std::string &process, std::string &pluginPath) {
  206 + void linkStatisticProcessWithPlugin(std::string process, std::string pluginPath) {
207 207 _StatisticProcessPlugingMap[process] =pluginPath;
208 208 }
209 209  
210   - void linkParamOutputsWithPlugin(std::string &process, std::string &pluginPath) {
  210 + void linkParamOutputsWithPlugin(std::string process, std::string pluginPath) {
211 211 _paramOutputPlugingMap[process] = pluginPath;
212 212 }
213 213  
214   - void linkParamGetWithPlugin(std::string &process, std::string &pluginPath) {
  214 + void linkParamGetWithPlugin(std::string process, std::string pluginPath) {
215 215 _paramGetPlugingMap[process] = pluginPath;
216 216 }
217 217  
... ...
src/Plugins/Plugin.hh
  Diff comments   View file @3caf58e
... ... @@ -43,8 +43,8 @@ class Plugin {
43 43 }
44 44  
45 45 /// Register the plugin to a kernel
46   - void registerPlugin(PluginManager &K, std::string& pluginPath) {
47   - m_pfnRegisterPlugin(K, pluginPath);
  46 + void registerPlugin(PluginManager &K) {
  47 + m_pfnRegisterPlugin(K);
48 48 }
49 49  
50 50 private:
... ...
src/Plugins/PluginManager.cc
  Diff comments   View file @3caf58e
... ... @@ -80,8 +80,10 @@ void PluginManager::registerPlugin( const std::string &amp;pluginName, const std::st
80 80  
81 81 Plugin plugin( pluginPath+"/"+pluginName);
82 82  
83   - _loadedPlugins.insert(PluginMap::value_type( pluginName, plugin)).first->second.registerPlugin(*this, pluginPath+"/"+pluginName);
84   -
  83 + _loadedPlugins.insert(PluginMap::value_type( pluginName, plugin)).first->second.registerPlugin(*this);
  84 +
  85 + _currentPluginPath = pluginPath+"/"+pluginName;
  86 +
85 87 //PluginWatcher::getInstance()->addPluginToWatch(pluginPath);
86 88  
87 89 LOG4CXX_INFO(gLogger, "PluginManager::loadPlugin :: " << pluginName << " plugin load successfully" );
... ...
src/Plugins/PluginManager.hh
  Diff comments   View file @3caf58e
... ... @@ -61,6 +61,14 @@ public:
61 61  
62 62 void registerPlugin(const std::string &pluginName,
63 63 const std::string &pluginPath);
  64 +
  65 + std::string getCurrentPluginPath(){
  66 + return _currentPluginPath;
  67 + }
  68 +
  69 + void setCurrentPluginPath(std::string& pluginPath){
  70 + _currentPluginPath = pluginPath;
  71 + }
64 72  
65 73 protected:
66 74  
... ... @@ -86,6 +94,7 @@ private:
86 94 /// Map of plugins by their associated file names
87 95 typedef std::map<std::string, Plugin> PluginMap;
88 96 PluginMap _loadedPlugins; ///< All plugins currently loaded
  97 + std::string _currentPluginPath;
89 98 };
90 99  
91 100 } // namespace Plugins
... ...