Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Pawian
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
PWA
Pawian
Commits
4e3cf138
Commit
4e3cf138
authored
15 years ago
by
Bertram Kopf
Browse files
Options
Downloads
Patches
Plain Diff
small bug fix
parent
72aef839
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeModules/FindROOT.cmake
+3
-0
3 additions, 0 deletions
CMakeModules/FindROOT.cmake
Examples/qft++/CMakeLists.txt
+48
-18
48 additions, 18 deletions
Examples/qft++/CMakeLists.txt
Utils/ErrValue.cc
+0
-1
0 additions, 1 deletion
Utils/ErrValue.cc
with
51 additions
and
19 deletions
CMakeModules/FindROOT.cmake
+
3
−
0
View file @
4e3cf138
...
@@ -116,8 +116,11 @@ IF (ROOT_FOUND)
...
@@ -116,8 +116,11 @@ IF (ROOT_FOUND)
# STRING(REGEX MATCHALL "-L([^ ])+" root_library ${root_flags})
# STRING(REGEX MATCHALL "-L([^ ])+" root_library ${root_flags})
# REMOVE_FROM_LIST(root_flags "${root_libs_all}" "${root_library}")
# REMOVE_FROM_LIST(root_flags "${root_libs_all}" "${root_library}")
SET
(
root_flags
${
root_flags
}
-lMinuit
)
SET
(
ROOT_LIBRARIES
${
root_flags
}
)
SET
(
ROOT_LIBRARIES
${
root_flags
}
)
# MESSAGE("ROOT_LIBRARIES: " ${ROOT_LIBRARIES})
# Make variables changeble to the advanced user
# Make variables changeble to the advanced user
MARK_AS_ADVANCED
(
ROOT_LIBRARY_DIR ROOT_INCLUDE_DIR ROOT_DEFINITIONS
)
MARK_AS_ADVANCED
(
ROOT_LIBRARY_DIR ROOT_INCLUDE_DIR ROOT_DEFINITIONS
)
...
...
This diff is collapsed.
Click to expand it.
Examples/qft++/CMakeLists.txt
+
48
−
18
View file @
4e3cf138
...
@@ -6,47 +6,77 @@ if(COMMAND cmake_policy)
...
@@ -6,47 +6,77 @@ if(COMMAND cmake_policy)
cmake_policy
(
SET CMP0003 NEW
)
cmake_policy
(
SET CMP0003 NEW
)
endif
(
COMMAND cmake_policy
)
endif
(
COMMAND cmake_policy
)
SET
(
EXECUTABLENAME compton_scatteringApp
)
SET
(
INCLUDE_DIRECTORIES
SET
(
EXECUTABLENAME1 SeqDecayHeliAmpsApp
)
SET
(
INCLUDE_DIRECTORIES
${
ROOT_INCLUDE_DIR
}
${
ROOT_INCLUDE_DIR
}
${
CMAKE_SOURCE_DIR
}
)
${
CMAKE_SOURCE_DIR
}
)
SET
(
${
EXECUTABLENAME
}
_SRCS
INCLUDE_DIRECTORIES
(
AFTER
compton_scattering.cc
${
ROOT_INCLUDE_DIR
}
${
CMAKE_SOURCE_DIR
}
)
)
SET
(
${
EXECUTABLENAME1
}
_SRCS
LINK_DIRECTORIES
(
${
ROOT_LIBRARY_DIR
}
)
SeqDecHeliAmps.cc
SeqDecayHeliAmpsMain.cc
######## Linking "compton_scatteringApp ###########################
SET
(
EXECUTABLENAME compton_scatteringApp
)
SET
(
${
EXECUTABLENAME
}
_SRCS
compton_scattering.cc
)
)
ADD_EXECUTABLE
(
${
EXECUTABLENAME
}
ADD_EXECUTABLE
(
${
EXECUTABLENAME
}
${${
EXECUTABLENAME
}
_SRCS
}
${${
EXECUTABLENAME
}
_SRCS
}
)
)
ADD_EXECUTABLE
(
${
EXECUTABLENAME
1
}
TARGET_LINK_LIBRARIES
(
${
EXECUTABLENAME
}
${${
EXECUTABLENAME1
}
_SRCS
}
qft++
)
)
INCLUDE_DIRECTORIES
(
AFTER
INSTALL
(
TARGETS
${
EXECUTABLENAME
}
DESTINATION bin/
${
EXECUTABLENAME
}
)
# ${PROJECT_SOURCE_DIR}/examples/SampleIndividuals
${
ROOT_INCLUDE_DIR
}
######## End: Linking "compton_scatteringApp ###########################
${
CMAKE_SOURCE_DIR
}
######## Linking "SeqDecayHeliAmpsApp ###########################
SET
(
EXECUTABLENAME SeqDecayHeliAmpsApp
)
SET
(
${
EXECUTABLENAME
}
_SRCS
SeqDecHeliAmps.cc
SeqDecayHeliAmpsMain.cc
)
ADD_EXECUTABLE
(
${
EXECUTABLENAME
}
${${
EXECUTABLENAME
}
_SRCS
}
)
)
TARGET_LINK_LIBRARIES
(
${
EXECUTABLENAME
}
TARGET_LINK_LIBRARIES
(
${
EXECUTABLENAME
}
qft++
qft++
${
ROOT_LIBRARIES
}
)
)
INSTALL
(
TARGETS
${
EXECUTABLENAME1
}
DESTINATION bin/
${
EXECUTABLENAME
}
)
#LINK_DIRECTORIES(${ROOT_LIBRARY_DIR})
######## End of Linking "SeqDecayHeliAmpsApp ###########################
TARGET_LINK_LIBRARIES
(
${
EXECUTABLENAME1
}
######## Linking "EtacToa1320pi0fit" ###########################
SET
(
EXECUTABLENAME EtacToa1320pi0fitApp
)
SET
(
${
EXECUTABLENAME
}
_SRCS
EtacToa1320pi0fit.cc
)
ADD_EXECUTABLE
(
${
EXECUTABLENAME
}
${${
EXECUTABLENAME
}
_SRCS
}
)
MESSAGE
(
"ROOT_LIBRARIES: "
${
ROOT_LIBRARIES
}
)
TARGET_LINK_LIBRARIES
(
${
EXECUTABLENAME
}
Minuit2
qft++
qft++
${
ROOT_LIBRARIES
}
${
ROOT_LIBRARIES
}
)
)
INSTALL
(
TARGETS
${
EXECUTABLENAME
}
DESTINATION bin/
${
EXECUTABLENAME
}
)
INSTALL
(
TARGETS
${
EXECUTABLENAME
}
DESTINATION bin/
${
EXECUTABLENAME
}
)
INSTALL
(
TARGETS
${
EXECUTABLENAME1
}
DESTINATION bin/
${
EXECUTABLENAME1
}
)
######## End of Linking "EtacToa1320pi0fit" ###########################
This diff is collapsed.
Click to expand it.
Utils/ErrValue.cc
+
0
−
1
View file @
4e3cf138
...
@@ -5,7 +5,6 @@
...
@@ -5,7 +5,6 @@
#include
"Utils/ErrValue.hh"
#include
"Utils/ErrValue.hh"
#include
<math.h>
#include
<math.h>
bla
#define sqr(x) (x*x)
#define sqr(x) (x*x)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment