CDPP / AMDA_Kernel

Commit 171af14a2e56109f5dd746cd4d9b2c314da2d931

Authored by Elena.Budnik
1 parent d7f15348
Exists in master and in 81 other branches 10038, 10098, 5390, 5770, 6728, 7616, 7811, 7875, 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_6912, rm_7926, rm_8050, rm_8932, shue, shue97, test-merge, ubuntu

correct input for Jop model

Showing 2 changed files with 9 additions and 6 deletions   Show diff stats
Inline Side-by-side
src/ExternLib/Jupiter_JRM09_CAN_81/Jupiter_JRM09_CAN81.hh
  Diff comments   View file @171af14
... ... @@ -69,10 +69,15 @@ namespace AMDA {
69 69 if (lVal[0] == 0)
70 70 lVal[0] = 1e-31;
71 71 //
72   - lVal[1] = 180 - std::acos(in[2] / lVal[0])*180 / PI;
  72 + lVal[1] = std::acos(in[2] / lVal[0])*180 / PI;
73 73 //
74 74  
75   - lVal[2] = std::atan(in[1] / in[0])*180 / PI;
  75 + lVal[2] = std::atan2(in[1] , in[0])*180 / PI;
  76 +// if (in[0] < 0)
  77 +// lVal[2] += 180.0;
  78 + if (lVal[2] < 0)
  79 + lVal[2] += 360.0;
  80 +
76 81 double crtTime = _paramInput.getTime(_index);
77 82  
78 83 vector<DataType> outputBrtp;
... ...
src/ExternLib/Jupiter_JRM09_CAN_81/Jupiter_JRM09_CAN81_tools.hh
  Diff comments   View file @171af14
... ... @@ -152,10 +152,8 @@ namespace AMDA {
152 152 x = 1e-31;
153 153 if(r==0)
154 154 r = 1e-31;
155   - T theta = acos(z / r)*180.0 / PI;
156   - T phi = atan(y / x)*180.0 / PI;
157   - if (x < 0)
158   - phi += 180.0;
  155 + T theta = acos(z / r)*180.0 / PI ;
  156 + T phi = atan2(y , x)*180.0 / PI ;
159 157 if (phi < 0)
160 158 phi += 360.0;
161 159 vector<T> result{r, theta, phi};
... ...