-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathdiff
338 lines (293 loc) · 11.1 KB
/
diff
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
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
diff --git a/Makefile b/Makefile
index 0a5a6af..47abedc 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@ GTB_LIBQL2_LIB=$(libdir)
####### 3) Compiler, tools and options
#Insert the optional parameter to the compiler. The CFLAGS could be changed externally by the user
-CFLAGS =
+CFLAGS = -std=c++11
AR = ar cqs
TAR = tar -cf
GZIP = gzip -9f
diff --git a/projects/MCVLib/code/MCVElectricalCalib.cpp b/projects/MCVLib/code/MCVElectricalCalib.cpp
index ee4e81d..9f873e5 100644
--- a/projects/MCVLib/code/MCVElectricalCalib.cpp
+++ b/projects/MCVLib/code/MCVElectricalCalib.cpp
@@ -203,7 +203,7 @@ int MCVElectricalCalib::FitPeaks(int ipd, TH1F *aux, float xmin, float xmax)
cout << "PD " << ipd << ": no peak found" << endl;
return 0;
} else {
- Float_t *xpeaks = s->GetPositionX();
+ Float_t *xpeaks = (Float_t*) s->GetPositionX();
// fit peak 1
par[1] = aux->GetXaxis()->FindBin(xpeaks[0]);
diff --git a/projects/MCVLib/code/MCVEnergyThreshold.cpp b/projects/MCVLib/code/MCVEnergyThreshold.cpp
index b09e337..5369505 100644
--- a/projects/MCVLib/code/MCVEnergyThreshold.cpp
+++ b/projects/MCVLib/code/MCVEnergyThreshold.cpp
@@ -69,7 +69,7 @@ int MCVEnergyThreshold::Calculate()
cout << "*** bar " << i << " - PD-A - NO peak found!" << endl;
continue;
} else {
- Float_t *xpeaks = s->GetPositionX();
+ Float_t *xpeaks = (Float_t*) s->GetPositionX();
int k50=1, k90=1;
float cmax=0.;
float c50=0.;
diff --git a/projects/MCVLib/code/MCVGridOffset.cpp b/projects/MCVLib/code/MCVGridOffset.cpp
index 573515e..27791e6 100644
--- a/projects/MCVLib/code/MCVGridOffset.cpp
+++ b/projects/MCVLib/code/MCVGridOffset.cpp
@@ -74,7 +74,7 @@ int MCVGridOffset::Calculate()
//gramp[i] = 0.;
//continue;
} else {
- Float_t *xpeaks = s->GetPositionX();
+ Float_t *xpeaks = (Float_t*) s->GetPositionX();
//cout << "bar " << i << " - PD-A - found peak at ch " << xpeaks[0] << endl;
par[1] = aux->GetXaxis()->FindBin(xpeaks[0]);
}
@@ -110,7 +110,7 @@ int MCVGridOffset::Calculate()
//gramp[i+30] = 0.;
//continue;
} else {
- Float_t *xpeaks = s->GetPositionX();
+ Float_t *xpeaks = (Float_t*) s->GetPositionX();
//cout << "bar " << i << " - PD-B - found peak at ch " << xpeaks[0] << endl;
par[1] = aux->GetXaxis()->FindBin(xpeaks[0]);
}
diff --git a/projects/MCVLib/code/MCVHisto3908.h b/projects/MCVLib/code/MCVHisto3908.h
index 067c0e3..026a3e8 100644
--- a/projects/MCVLib/code/MCVHisto3908.h
+++ b/projects/MCVLib/code/MCVHisto3908.h
@@ -111,18 +111,18 @@ class MCVHisto3908
// for hist and plot msec are used as time units (on L1 fits we have microsec)
static const int nummsec = 60000 ; //! num of msec for E-t histo ( 1 minutes )
- static const double minsec = 0.0 ; //! E-t: t range: from 0 to 10 minutes
- static const double maxsec = 600000.0 ; //! step : 10 msec
+ static const long minsec = 0.0 ; //! E-t: t range: from 0 to 10 minutes
+ static const long maxsec = 600000.0 ; //! step : 10 msec
// static const int nummsec_ric ; //unused, the time step == sit integration time
- static const double minsec_ric = 0.0 ; //! E-t: t range: from 0 to 10 minutes
- static const double maxsec_ric = 600000.0 ; //! step : 10 msec
+ static const long minsec_ric = 0.0 ; //! E-t: t range: from 0 to 10 minutes
+ static const long maxsec_ric = 600000.0 ; //! step : 10 msec
int numE ; //! num of E points
- static const double stepE = 0.500 ; //! bin step: UNITS: MEV
- static const double minE = 0.0 ; //! E-t: E range: from 0 to 100 Mev
- static const double maxE = 100.0 ; //!
+ static const long stepE = 0.500 ; //! bin step: UNITS: MEV
+ static const long minE = 0.0 ; //! E-t: E range: from 0 to 100 Mev
+ static const long maxE = 100.0 ; //!
// static const double MCALEbsrlim0 = 0.701 ; //! MCAL bsr E range limits (Mev)
// static const double MCALEbsrlim1 = 1.4021 ; //!
diff --git a/projects/convPKP3908toRoot/Makefile b/projects/convPKP3908toRoot/Makefile
index 2056b3d..b296c67 100644
--- a/projects/convPKP3908toRoot/Makefile
+++ b/projects/convPKP3908toRoot/Makefile
@@ -66,7 +66,7 @@ ICON_DIR = ui
####### 4) Compiler, tools and options
-CC = gcc
+CC = g++
CXX = g++
#The root additional parameter
ROOTCFLAGS := $(shell root-config --cflags)
diff --git a/projects/hkmonitor/Makefile b/projects/hkmonitor/Makefile
index 7cd4c88..26f87b6 100644
--- a/projects/hkmonitor/Makefile
+++ b/projects/hkmonitor/Makefile
@@ -66,7 +66,7 @@ ICON_DIR = ui
####### 4) Compiler, tools and options
-CC = gcc
+CC = g++
CXX = g++
#The root additional parameter
ROOTCFLAGS := $(shell root-config --cflags)
diff --git a/projects/hkviewer/Makefile b/projects/hkviewer/Makefile
index 4b71ef8..e48ae7b 100644
--- a/projects/hkviewer/Makefile
+++ b/projects/hkviewer/Makefile
@@ -66,7 +66,7 @@ ICON_DIR = ui
####### 4) Compiler, tools and options
-CC = gcc
+CC = g++
CXX = g++
#The root additional parameter
ROOTCFLAGS := $(shell root-config --cflags)
diff --git a/projects/makespectra/Makefile b/projects/makespectra/Makefile
index e678203..4c8f488 100644
--- a/projects/makespectra/Makefile
+++ b/projects/makespectra/Makefile
@@ -66,7 +66,7 @@ ICON_DIR = ui
####### 4) Compiler, tools and options
-CC = gcc
+CC = g++
CXX = g++
#The root additional parameter
ROOTCFLAGS := $(shell root-config --cflags)
diff --git a/projects/mcalanalyzer/Makefile b/projects/mcalanalyzer/Makefile
index 4b81aba..0316959 100644
--- a/projects/mcalanalyzer/Makefile
+++ b/projects/mcalanalyzer/Makefile
@@ -66,7 +66,7 @@ ICON_DIR = ui
####### 4) Compiler, tools and options
-CC = gcc
+CC = g++
CXX = g++
#The root additional parameter
ROOTCFLAGS := $(shell root-config --cflags)
diff --git a/projects/mcalcor2fits/Makefile b/projects/mcalcor2fits/Makefile
index 07eea46..7827e02 100644
--- a/projects/mcalcor2fits/Makefile
+++ b/projects/mcalcor2fits/Makefile
@@ -66,7 +66,7 @@ ICON_DIR = ui
####### 4) Compiler, tools and options
-CC = gcc
+CC = g++
CXX = g++
#The root additional parameter
ROOTCFLAGS := $(shell root-config --cflags)
diff --git a/projects/mcalgrid/Makefile b/projects/mcalgrid/Makefile
index 7a7b2fa..b81c9da 100644
--- a/projects/mcalgrid/Makefile
+++ b/projects/mcalgrid/Makefile
@@ -66,7 +66,7 @@ ICON_DIR = ui
####### 4) Compiler, tools and options
-CC = gcc
+CC = g++
CXX = g++
#The root additional parameter
ROOTCFLAGS := $(shell root-config --cflags)
diff --git a/projects/mcalibration/Makefile b/projects/mcalibration/Makefile
index 9384463..1ce43b4 100644
--- a/projects/mcalibration/Makefile
+++ b/projects/mcalibration/Makefile
@@ -66,7 +66,7 @@ ICON_DIR = ui
####### 4) Compiler, tools and options
-CC = gcc
+CC = g++
CXX = g++
#The root additional parameter
ROOTCFLAGS := $(shell root-config --cflags)
diff --git a/projects/mcalimaging/Makefile b/projects/mcalimaging/Makefile
index 2837d10..afb8656 100644
--- a/projects/mcalimaging/Makefile
+++ b/projects/mcalimaging/Makefile
@@ -66,7 +66,7 @@ ICON_DIR = ui
####### 4) Compiler, tools and options
-CC = gcc
+CC = g++
CXX = g++
#The root additional parameter
ROOTCFLAGS := $(shell root-config --cflags)
diff --git a/projects/mcalselect/Makefile b/projects/mcalselect/Makefile
index 53df9c3..49532d8 100644
--- a/projects/mcalselect/Makefile
+++ b/projects/mcalselect/Makefile
@@ -66,7 +66,7 @@ ICON_DIR = ui
####### 4) Compiler, tools and options
-CC = gcc
+CC = g++
CXX = g++
#The root additional parameter
ROOTCFLAGS := $(shell root-config --cflags)
diff --git a/projects/mergedataset/Makefile b/projects/mergedataset/Makefile
index d7be466..26d03c7 100644
--- a/projects/mergedataset/Makefile
+++ b/projects/mergedataset/Makefile
@@ -66,7 +66,7 @@ ICON_DIR = ui
####### 4) Compiler, tools and options
-CC = gcc
+CC = g++
CXX = g++
#The root additional parameter
ROOTCFLAGS := $(shell root-config --cflags)
diff --git a/projects/plotgrb/Makefile b/projects/plotgrb/Makefile
index 535fd7e..1acabde 100644
--- a/projects/plotgrb/Makefile
+++ b/projects/plotgrb/Makefile
@@ -66,7 +66,7 @@ ICON_DIR = ui
####### 4) Compiler, tools and options
-CC = gcc
+CC = g++
CXX = g++
#The root additional parameter
ROOTCFLAGS := $(shell root-config --cflags)
diff --git a/projects/plotmcaldata/Makefile b/projects/plotmcaldata/Makefile
index 7e0bb5e..7368605 100644
--- a/projects/plotmcaldata/Makefile
+++ b/projects/plotmcaldata/Makefile
@@ -66,7 +66,7 @@ ICON_DIR = ui
####### 4) Compiler, tools and options
-CC = gcc
+CC = g++
CXX = g++
#The root additional parameter
ROOTCFLAGS := $(shell root-config --cflags)
diff --git a/projects/process3908/Makefile b/projects/process3908/Makefile
index 515bffd..b72f023 100644
--- a/projects/process3908/Makefile
+++ b/projects/process3908/Makefile
@@ -66,7 +66,7 @@ ICON_DIR = ui
####### 4) Compiler, tools and options
-CC = gcc
+CC = g++
CXX = g++
#The root additional parameter
ROOTCFLAGS := $(shell root-config --cflags)
diff --git a/projects/root2fits/Makefile b/projects/root2fits/Makefile
index 1666a8c..6a6ef14 100644
--- a/projects/root2fits/Makefile
+++ b/projects/root2fits/Makefile
@@ -66,7 +66,7 @@ ICON_DIR = ui
####### 4) Compiler, tools and options
-CC = gcc
+CC = g++
CXX = g++
#The root additional parameter
ROOTCFLAGS := $(shell root-config --cflags)
diff --git a/projects/scirm_analysis/Makefile b/projects/scirm_analysis/Makefile
index 6400884..12fb01b 100644
--- a/projects/scirm_analysis/Makefile
+++ b/projects/scirm_analysis/Makefile
@@ -66,7 +66,7 @@ ICON_DIR = ui
####### 4) Compiler, tools and options
-CC = gcc
+CC = g++
CXX = g++
#The root additional parameter
ROOTCFLAGS := $(shell root-config --cflags)
diff --git a/projects/viewbsr/Makefile b/projects/viewbsr/Makefile
index 720561a..35d96df 100644
--- a/projects/viewbsr/Makefile
+++ b/projects/viewbsr/Makefile
@@ -66,7 +66,7 @@ ICON_DIR = ui
####### 4) Compiler, tools and options
-CC = gcc
+CC = g++
CXX = g++
#The root additional parameter
ROOTCFLAGS := $(shell root-config --cflags)
diff --git a/projects/viewbsr_ric/Makefile b/projects/viewbsr_ric/Makefile
index 485c008..5de0773 100644
--- a/projects/viewbsr_ric/Makefile
+++ b/projects/viewbsr_ric/Makefile
@@ -66,7 +66,7 @@ ICON_DIR = ui
####### 4) Compiler, tools and options
-CC = gcc
+CC = g++
CXX = g++
#The root additional parameter
ROOTCFLAGS := $(shell root-config --cflags)
diff --git a/projects/viewrun/Makefile b/projects/viewrun/Makefile
index 38ae73f..3523d45 100644
--- a/projects/viewrun/Makefile
+++ b/projects/viewrun/Makefile
@@ -66,7 +66,7 @@ ICON_DIR = ui
####### 4) Compiler, tools and options
-CC = gcc
+CC = g++
CXX = g++
#The root additional parameter
ROOTCFLAGS := $(shell root-config --cflags)