-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path0001-hacks.patch
More file actions
197 lines (191 loc) · 6.47 KB
/
0001-hacks.patch
File metadata and controls
197 lines (191 loc) · 6.47 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
From 0f2125fc9e66813747d16ff5dcf69817e5269d7b Mon Sep 17 00:00:00 2001
From: Paul Seyfert <paul.seyfert@mib.infn.it>
Date: Wed, 22 Feb 2017 21:21:31 +0100
Subject: [PATCH] hacks
---
CMakeLists.txt | 3 +
Hlt/HltTracking/src/HltTrackFilterGhostProb.cpp | 2 +-
Tr/TrackUtils/.ycm_extra_conf.py | 128 ++++++++++++++++++++++++
Tr/TrackUtils/CMakeLists.txt | 2 +
Tr/TrackUtils/src/TrackBestTrackCreator.cpp | 1 +
5 files changed, 135 insertions(+), 1 deletion(-)
create mode 100644 Tr/TrackUtils/.ycm_extra_conf.py
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 251482d..a283ee1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,3 +24,6 @@ if(GangaTools_FOUND)
else()
message(WARNING "Ganga integration not available (cannot find GangaTools.cmake)")
endif()
+
+set(CMAKE_EXPORT_COMPILE_COMMANDS "ON")
+
diff --git a/Hlt/HltTracking/src/HltTrackFilterGhostProb.cpp b/Hlt/HltTracking/src/HltTrackFilterGhostProb.cpp
index 1e29d45..8d90a3c 100644
--- a/Hlt/HltTracking/src/HltTrackFilterGhostProb.cpp
+++ b/Hlt/HltTracking/src/HltTrackFilterGhostProb.cpp
@@ -75,7 +75,7 @@ StatusCode HltTrackFilterGhostProb::tracksFromTrack( const LHCb::Track& track,
}else{
return StatusCode::SUCCESS;
}
- if ( track.ghostProbability() < m_maxGhostProbCut ){
+ if ( track.ghostProbability() < 1.5 ){
// There is a good enough candidate, put the track into the output.
tracks.push_back( tr );
}
diff --git a/Tr/TrackUtils/.ycm_extra_conf.py b/Tr/TrackUtils/.ycm_extra_conf.py
new file mode 100644
index 0000000..5273f63
--- /dev/null
+++ b/Tr/TrackUtils/.ycm_extra_conf.py
@@ -0,0 +1,128 @@
+
+
+import os
+import ycm_core
+
+from clang_helpers import PrepareClangFlags
+
+def DirectoryOfThisScript():
+ return os.path.dirname(os.path.abspath(__file__))
+
+# This is the single most important line in this script. Everything else is just nice to have but
+# not strictly necessary.
+compilation_database_folder = DirectoryOfThisScript()
+
+# This provides a safe fall-back if no compilation commands are available. You could also add a
+# includes relative to your project directory, for example.
+flags = [
+ '-Wall',
+ '-std=c++11',
+ '-stdlib=libc++',
+ '-x',
+ 'c++',
+ '-I',
+ '.',
+ '-isystem', '/usr/local/include',
+ '-isystem', '/usr/include',
+ '-I.',
+]
+
+if compilation_database_folder:
+ if os.path.exists('compile_commands.json'):
+ database = ycm_core.CompilationDatabase(compilation_database_folder)
+ else:
+ try:
+ cmtconfig = os.environ['CMTCONFIG']
+ except KeyError:
+ database = None
+ else:
+ buildpath = "build."+cmtconfig
+ relpath = os.path.abspath(os.path.curdir)
+ abortcounter = 0
+ while not os.path.exists(os.path.join(relpath,buildpath,'compile_commands.json')):
+ if abortcounter > 6 or relpath == '/':
+ break
+ relpath = os.path.dirname(relpath)
+ abortcounter += 1
+ if os.path.exists(os.path.join(relpath,buildpath,'compile_commands.json')):
+ database = ycm_core.CompilationDatabase(os.path.join(relpath,buildpath))
+ else:
+ database = None
+else:
+ database = None
+
+SOURCE_EXTENSIONS = [ '.cpp', '.cxx', '.cc', '.c', '.m', '.mm' ]
+
+def MakeRelativePathsInFlagsAbsolute( flags, working_directory ):
+ if not working_directory:
+ return list( flags )
+ new_flags = []
+ make_next_absolute = False
+ path_flags = [ '-isystem', '-I', '-iquote', '--sysroot=' ]
+ for flag in flags:
+ new_flag = flag
+
+ if make_next_absolute:
+ make_next_absolute = False
+ if not flag.startswith( '/' ):
+ new_flag = os.path.join( working_directory, flag )
+
+ for path_flag in path_flags:
+ if flag == path_flag:
+ make_next_absolute = True
+ break
+
+ if flag.startswith( path_flag ):
+ path = flag[ len( path_flag ): ]
+ new_flag = path_flag + os.path.join( working_directory, path )
+ break
+
+ if new_flag:
+ new_flags.append( new_flag )
+ return new_flags
+
+
+def IsHeaderFile( filename ):
+ extension = os.path.splitext( filename )[ 1 ]
+ return extension in [ '.h', '.hxx', '.hpp', '.hh' ]
+
+
+def GetCompilationInfoForFile( filename ):
+ # The compilation_commands.json file generated by CMake does not have entries
+ # for header files. So we do our best by asking the db for flags for a
+ # corresponding source file, if any. If one exists, the flags for that file
+ # should be good enough.
+ if IsHeaderFile( filename ):
+ basename = os.path.splitext( filename )[ 0 ]
+ for extension in SOURCE_EXTENSIONS:
+ replacement_file = basename + extension
+ if os.path.exists( replacement_file ):
+ compilation_info = database.GetCompilationInfoForFile(
+ replacement_file )
+ if compilation_info.compiler_flags_:
+ return compilation_info
+ return None
+ return database.GetCompilationInfoForFile( filename )
+
+
+def FlagsForFile( filename, **kwargs ):
+ if database:
+ # Bear in mind that compilation_info.compiler_flags_ does NOT return a
+ # python list, but a "list-like" StringVec object
+ compilation_info = GetCompilationInfoForFile( filename )
+ if not compilation_info:
+ return None
+
+ final_flags = MakeRelativePathsInFlagsAbsolute(
+ compilation_info.compiler_flags_,
+ compilation_info.compiler_working_dir_ )
+
+ else:
+ relative_to = DirectoryOfThisScript()
+ final_flags = MakeRelativePathsInFlagsAbsolute( flags, relative_to )
+
+ return {
+ 'flags': final_flags,
+ 'do_cache': True
+ }
+
diff --git a/Tr/TrackUtils/CMakeLists.txt b/Tr/TrackUtils/CMakeLists.txt
index ce00cf3..39bc7bd 100644
--- a/Tr/TrackUtils/CMakeLists.txt
+++ b/Tr/TrackUtils/CMakeLists.txt
@@ -23,3 +23,5 @@ gaudi_add_module(TrackUtils
INCLUDE_DIRS Tr/TrackInterfaces Tf/TfKernel
LINK_LIBRARIES CaloDetLib OTDetLib STDetLib HltEvent LinkerEvent TrackEvent GaudiAlgLib HltInterfaces LHCbMathLib PartPropLib TrackFitEvent TrackKernel)
+
+
diff --git a/Tr/TrackUtils/src/TrackBestTrackCreator.cpp b/Tr/TrackUtils/src/TrackBestTrackCreator.cpp
index 1f967dd..4c2022c 100644
--- a/Tr/TrackUtils/src/TrackBestTrackCreator.cpp
+++ b/Tr/TrackUtils/src/TrackBestTrackCreator.cpp
@@ -372,6 +372,7 @@ StatusCode TrackBestTrackCreator::initialize()
}
}
+ m_maxGhostProb = 1.5; // The default value is 999
// Print out the user-defined settings
// -----------------------------------
--
2.1.4