Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Docker-in-Docker (DinD) capabilities of public runners deactivated.
More info
Open sidebar
marty
marty-public
Commits
c7289e58
Commit
c7289e58
authored
Mar 12, 2021
by
Grégoire Uhlrich
Browse files
lhaBlocks added to LHA Module
parent
ceac61f2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
marty/include/mtylibrary.h
marty/include/mtylibrary.h
+1
-0
marty/models/src/pmssm_content.cpp
marty/models/src/pmssm_content.cpp
+3
-1
No files found.
marty/include/mtylibrary.h
View file @
c7289e58
...
@@ -76,6 +76,7 @@ namespace mty {
...
@@ -76,6 +76,7 @@ namespace mty {
sysres
=
system
((
"cp "
+
martySrc
+
"/lhaData.cpp "
+
targetSrc
).
c_str
());
sysres
=
system
((
"cp "
+
martySrc
+
"/lhaData.cpp "
+
targetSrc
).
c_str
());
sysres
=
system
((
"cp "
+
martyInc
+
"/lha.h "
+
targetInc
).
c_str
());
sysres
=
system
((
"cp "
+
martyInc
+
"/lha.h "
+
targetInc
).
c_str
());
sysres
=
system
((
"cp "
+
martyInc
+
"/lhaData.h "
+
targetInc
).
c_str
());
sysres
=
system
((
"cp "
+
martyInc
+
"/lhaData.h "
+
targetInc
).
c_str
());
sysres
=
system
((
"cp "
+
martyInc
+
"/lhaBlocks.h "
+
targetInc
).
c_str
());
sysres
=
system
((
"cp "
+
pathToMarty
+
"/../csl/include/std_vector*.h "
+
targetInc
).
c_str
());
sysres
=
system
((
"cp "
+
pathToMarty
+
"/../csl/include/std_vector*.h "
+
targetInc
).
c_str
());
}
}
...
...
marty/models/src/pmssm_content.cpp
View file @
c7289e58
...
@@ -67,8 +67,10 @@ void PMSSM_LEM::initContent()
...
@@ -67,8 +67,10 @@ void PMSSM_LEM::initContent()
M_3
=
mty
::
mssm_input
::
M3
;
M_3
=
mty
::
mssm_input
::
M3
;
M_2
=
mty
::
mssm_input
::
M2
;
M_2
=
mty
::
mssm_input
::
M2
;
M_W
=
mty
::
sm_input
::
M_W
;
M_A
=
mty
::
mssm_input
::
MA
;
M_A
=
mty
::
mssm_input
::
MA
;
M_W
=
mty
::
sm_input
::
M_W
;
m_A0
=
M_A
;
m_A0
=
M_A
;
theta_W
=
mty
::
sm_input
::
theta_W
;
theta_W
=
mty
::
sm_input
::
theta_W
;
_beta
=
csl
::
atan_s
(
mty
::
mssm_input
::
tanb
);
_beta
=
csl
::
atan_s
(
mty
::
mssm_input
::
tanb
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment