-
Notifications
You must be signed in to change notification settings - Fork 1
Expand file tree
/
Copy pathversion.log
More file actions
505 lines (415 loc) · 22.2 KB
/
version.log
File metadata and controls
505 lines (415 loc) · 22.2 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
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
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
20170222,
in this version, there is a new mode "quick_save_plot".
By this mode users do not need to set up " = PDFsetDir !", " = PDFsetmethod !"
since the correlation data is stored in correlation_data.m
what we need to setup:
"quick_save_plot = runfunc !"
" = figureDirtag !" set where to put the output figures
" = PDFname !" to set which PDFset users want to plot, presently only CT14nnlo is available
" = datalist !": the path of file "dat16lisformathematica"
" = expttype !" and " = exptid !": depend on users, deciding which experiments are plotted
===========================
How we run:
math -script correlation_plot_project_v5_script.m
============================
20170301
1. the config file is replaced by a new version
2. work for smu workstation: curie, rubin (Mathematica 10.2)
3. explanation of new configure file for the web site:
presently, my Mathematica script only read following arguments, which means
functions or options for other arguments have not yet been workout:
PDF set:
Expt. ID:
Expt. Flag:
"PDF set:" is the "PDFname" of old configure file.
"Expt. ID:" & "Expt. Flag:" are used to replace "= expttype !" & "= exptid !";
"Expt. ID:" show all possible experimental ID a web user can choose.
"Expt. Flag:" set 0 & 1 to control whether an ID of "Expt. ID" should be used
as data for Mathematica.
---------------------------------
Checkboxes on the website
for "...Flag:" in config file,
we design checkboxes on website, if some boxes are checked, python should
set those flags as 1, some that the Mathematica code will run these functions
ex:
Figures to plot
x Experimental data points
x Experimental errors
x Residuals
x PDF errors on residuals
x Correlations with functions
x Histograms of correlations
x Sensitivity to functions
x Histograms of sensitivity
x ...
---------------------------------
for other arguments in old configure file such as:
"= figureDirtag !"
"= datalist !"
I setup these paths in Mathematica code.
plots can be found in ./plots
datalist file could be found in the same Dir of Mathematica main code.
"= runfunc !"
web version only runs quicksaveplot mode, so users don't need to choose the run mode.
"= PDFsetDir !"
"= PDFsetmethod !"
"= PDFDataDir !"
same reason, quicksaveplot mode does not use these arguments
=====================================
20170308
config file add new arguments
"Color by data percentage" allow user to input three number for percentage, ex: 40 65 90,
which means when you sort data from small to large, the position of the percentage in sorted data.
The percentage you choose seperate data by these percentage and give different color for these seprerated data in plots.
"Size" allow user to choose point size in plots
user could choose following sizes: tiny small medium large
"highlight mode" is for every plot type (presently from 1~7???)
user could choose different way to highlight the data range he want to see
#mode 0: No highlight. mode 1: highlight data by range of value. mode 2: highlight data by range of percentage
for mode 1: every plot type has 2 values, val1 val2, means highlight range of value of a data point,
ex: for "correlation" plots, 0.4 0.75 means data in (0.4,0.75) will be highlighted
for mode 2: val1 val2 are percentage
ex: for "correlation" plots, 40 75 means data in (40%,75%) will be highlighted
example for Mathematica code reading these arguments:
for following config file
Type: 1 2 3 4 5 6 7
Mode: 0 2 0 1 0 1 1
Mode 1 range: 0.5 0.75 0.5 0.75 0.5 0.75 0.5 0.75 0.5 0.75 0.5 0.75 0.5 0.75
Mode 2 range: 50 86.55 50 86.55 50 86.55 50 86.55 50 86.55 50 86.55 50 86.55
code will read
Type: 1 2 3 4 5 6 7
Mode: 0 2 0 1 0 1 1
Mode 1 range: x x x x x x 0.5 0.75 x x 0.5 0.75 0.5 0.75
Mode 2 range: x x 50 86.55 x x x x x x x x x x
(
since mode 0 does not hightlight data, so the code will not use value of mode 1&2 range,
when user choose any mode, for example mode 1, config still need to have value for other modes for read
so that code will not show error message
)
============================
20170316
1. user option for #Functions to use in correlations set in program
2. size of point in highlight mode automatically set as small
3. make a meta_data_structure.txt file to record meta data in program
4. make a fake function of correlation to replace correlation function of library
(so that user mode corr, dr*corr can be calculated)
5. I find the script version and the .nb version get little different outputs,
for four plots combined in one by Grid function:
the .nb makes
A B plots
C D
script makes
A plots
B
C
D
========================
20170420
1. point size linearly enlarge in lighlighted region
2. deeper color for PDFCorrelationplot7 (Darker 0.1 -> 0.2)
20170427
For new experiments in 2017.0425.2123.-0500_ct14nn-new, modify the code
dtareadbotingw2016
1. ExptIDtoName: if lisTable does not include the input ExptID, return "None"
2. selectdatacolume: add new experiments into list
3. ExptIDEcm: add Sqrt(S) of new experiments
correlation_plot_project_v17_script.nb
1. (*global variables*) part, add ExptID of new experiments
quickdata
1. add data of the new CT14NNLO into quickdata by correlation_plot_project_v6_2.nb
and dtareadbotingw2016_for_v6_2.m
future:
1. use Export to save data into .m file
2. build a pragram to save data into .m file
3. seperate correlation project functions and the implementation part into different files
4. investigate which expts do not be included in the default calculation
5. .log file
===========================
20170606
v21:
adjust scale of correlation, sensitivity, deltaR, central of residue
make a function: comparison of grid&samept
make executables of three methods: samept, grid, xgrid
write a note for tutorial
barcolor modify for presentation
v22:
make script versions for executables
delete unused functions
data files of executables that making figures are setup in "plotdata_config.txt"
20170707
v23:
residue -> residual for all files
20170822
adding time information of running for samept figure making executables
20170828
adding expts_info_v3.nb: this executable enables users to know the information of PDF sets, data files
the expts_info_v3.m version: output information should come from the Print[] function, not yet finished
fix: ReadExptTable, add data label information and put in [[3]] of output
fix: readexptsbydta, remove the "wrongformat" reminder
define data label indexes of theory, shifteddata, and uncorrerror by variables (fxQsamept_corr.nb)
201700906
adding expts_info_v4.nb: change variable names, reorganize functions, add error messages for abnormal data
change data filename format .m -> .dat
20171016: add expt id 160, 545 into data list in ExptIDEcm
20171023: add combining two plotted data files function in expts_info_v5.nb
20171025: change barseperator of dr*corr in funtion processdataplotsmultiexp6percentage
20171027: advices:
google doc to ask Tim and Fred feedbacks for this package
(highlight mode confusing, LHAParse, how to get the physical predictions for other PDF sets such as NNPDF,
better way to read configure file: read file by Mathematica format, highlight mode grey out unhighlighted points)
20171030: change some string = "residue" to "residual" in corr_proj_funcs.nb(.m)
20171101: change files stored in ./quick_data/
from corr, dRcorr, residual central value, delta residual, expt error ratio -> residuals in all replicas, f(x,Q) in all replicas, .dta data of central set
also, calculation of observables for plotting are moved from fxQsamept_corr_vx.nb to run_vx.nb
10171102: solve the problem arises from setting config file for xmin, xmax, ymin, ymax as auto, set auto values in processdataplotsmultiexp6percentage
20171103: add mathematica expression format for output figures so that users can change details (label, ticks) themselve
20171103: some figures output have {} symbol, delete them
20171105: output for script version .eps -> .png
20171107: for highlight range, grey out unhighlighted data and use highlight range as barlegend seperator
20171108:
highlight mode and color palette change:
1. highlighted points have the same size, and larger than unhighlighted points
2. color palettes of highlight and no-highlight modes are the same
3, unhighlighted points become gray no matter in which color seperator interval they are
4. color palette, original {red - gray -blue}, become {red - green - blue}
5. expt error ratio & delta residual palette are only positive
other modify:
6. title labels of figures are simplified
7. lines in histogram part at negative side of residual error and expt error ratio are canceled, expt error ratio line: change from 50%, 70%, 85% of data to 0.1
20171108:
modify:
delete histograms with negative ranges of expt error ratio figure and delta residual figure
take absolute values for expt error ratio data
digital # of highlight range showed in the figures <= 2
20171108
reorganize the processdataplotsmultiexp6percentage and define it as processdataplotsmultiexp7percentage
20171109
1. new function (ReadUserFunction) for reading user define functions or data
2. build a new read configure file function: readcorrconfigfile5, deleting user define functions part in the new function
(so ReadUserFunction will take care of that part)
3. highlight range convention change: in functions readcorrconfigfile5, processdataplotsmultiexp7percentage
new convention: {{hmin1, hmax1}, {hmin2, hmax2}, ...}
4. for histogram of |obs|, fix the problem that title labels have no |...| symbol
20171109:
shorten name of 2017.1008.0954.-0500_CT14HERA2-jet.ev to CT14HERA2-jet.ev (in processdataplotsmultiexp7percentage)
20171111:
1. renew histogram plotting function: histplot4->histplot5, use binwidth as the input of the bin setting in histplot5
2. change lines on histogram-> think, unsaturate red and blue
3. percentage highlight mode: don't take the statistics for absolute values of data when calculating the percentage of highlight
4. fix the bug that when input 0% to GetDataPercentage, function will output data[[0]] which has no value
5. move highlight text in 2D-xQ plots to avoid covering data points and cutted by the left edge
6. if red lines in histograms exceed the frame, don't draw them
20171116
1. change the way to input the user define function
from python script -> user_define_func.txt (don't write values from main.py)
2. input could be a combination of PDFs for various flavours or a List with Nset values
read user define function way change (ReadUserFunctionV2 -> ReadUserFunctionV2)
3. input function FxQ[iflavour] or FxQ[iexpt,iflavour,ipt,iset]
20171119
1. ReadUserFunctionV2 -> ReadUserFunctionV3
user define function is between begin tag and end tag
so users can input multi-line command
2. user_define_func.txt -> user_func.txt
3. copy user_func.txt to the output directory
20171120
1. change the input arguments of FxQ in user_func.txt: iExpt -> ExptID. e.g. ExptID=159; FxQ[ExptID,ig,iPt,iSet]
2. change the main.py selection of flavours part: only shows bbar ~ b radios, but still write q6, q7, and q8 to config1.txt
3. add more descriptions about how to write functions in the user_func.txt
4. for .png in python script version, also generate .pdf files
20171124
1. organize printout messages
2. .dat Plot files -> .m
20171125
1. new formulas for (x,mu): 565~568, jet processes (Expt ID > 500), ID = 267
2. put executables in ./bin for generating f(x,Q)
3. check (x,Q) are reasonable before save f(x,Q) and residuals into files ( 10^-10<x<1, <1mu<10^6)
4. lower #precision to 4 so that data files become smaller and IO become faster
20171125
(in processdataplotsmultiexp7percentage)
for the mode 4 & 5 of the color palette separator
(*mode 4: depend on max and min of data*)
(*mode 5: depend on the range of histogram*)
use evenly separation -> use pseudo-log separation
20171125
1. define marker shapes (PlotMarkerList)
20171126
1. apply different maker shapes on data by their categories, data after categorized by classifymode (processdataplotsmultiexp7percentage)
functions generated: ClassifyPlottedData, ClassifyByGroups, MarkerList
2. reorder the data points ordering of all groups (categories) by their absolute values
so that small values of later groups will not cover large values of prior groups
3. for highlight mode, unhighlight size from small -> tiny for more complicated shapes in figures
4. generate plot type 1 (data points on xQ plane) by new function PlotDataTypeOne
bacause the way we setup plot type 1 is totally different with other types (corr, sensitivy, ...)
20171126
1. apply multi-shape on all plot types (corr, sens, residual, etc)
2. enlarge open shape size so that they become more clear
3. classifymode difined as global variable in run_v4.m
20171126
delete q8 when generating f(x,Q) data (in file fxQsamept_corr_v2.nb)
extract limited digits from a number -> save files with smaller sizes (fix the bug that SetPrecision is no use)
20171127
bug fix: ExptIDinfo for JP category
20171127
delete strings for q6~q8 in processdataplotsmultiexp7percentage
20171127:
bug: 565 formula pT, y -> 0
20171127
fix bug: fraction numbers get error message when exceeding the maximum system accuracy. change fractions -> numerics
delete some printout
20171127
only read/copy user function when user function mode in config1.txt is on (1)
20171128
replace hist xrange by color palette, delete hist yrange, and read jobid by string in config1.txt
20171128
fix the problem: when color palette range is not set as "auto", the color palette is not the histogram range
20171128
fix the JobID reading, no space
20171128:
remove ColorSeperator from the config file
add job description in the config file
set job description in exptname_table output
20171128
update the 11 flavour quick_data in quick_data.zip
20171128
change the labels of delta residual and sigma/D for histograms of abs values and x-mu plot
20171128
fix the bug: when transform numbers to 4-digit fraction numbers, forgot to consider the positive/minus signs
20171128
update quick_data.zip with both positive and negative valuesxx
20171129
update the default configure files
20171130
fix the bug for ID = 5xx, y = (ymin+ymax)/2, -y = -(ymin+ymax)/2
rewrite the formulas of (x,Q) transform in more readable mathematica symbols
20171201
point shapes simplify
show max and min values of the color palettes
For plot type Flag, mode 1 -> mode 1 or -1, 1: absolute values of data, -1: sign data
20171201
fix bug: when plot type = 1, xQ plot is not the figure of |data|
20171201
1. fix the upbound = max value * 1.001,
because we add the same color interval after the max color interval for showing max and min values of the color palettes
we don't need max value * 1.001 to get the safe range anymore
2. fix bug: when drawing |data|, percentage highlight should choose the percentage of |data| rather than the percentage of data
3. enlarge star symbol
4. for plot type 1, color change for every new Expt ID
5. modify colors of shapes in plot type 1, delete grey
20171201
for |data| plots (flag = +1), add +1 in their filenames (xQ+1, hist+1)
the same for data plots (flag = -1)
20171202
save files with info of data for each plot type
all .m figure files with the same plot type are saved in one file
20171202
fix the bug that each flavour index of correlation/sensitivity has a .m file
20171203
modify the number format in data info .txt files: for too large or small numbers, use the format like 2.33E6
20171206
update the pdf combine function to fit the new output filenames (GetxQplotListSameptV2)
rewrite merge pdf function
20171208
for jet events, select only 10-8 < x1, x2 < 1 points (in selectExptxQv2)
fix the y values in jet processes, y = (ymax - ymin)/2 -> y = (ymax + ymin)/2
add energy of 252~255 (in ExptIDEcm)
update the formulas for 252~255 (in selectExptxQv2)
20171209
for the info file, add Npt and total values info (Sum of values in all points)
update the quick_data
20171209
1. renew the convert figure format function and merge figures function
2. add nonepspdfcat, which merge files by latex code and pdflatex command.
this script is used for input files are not .eps files
when using .eps files, users need to use epspdfcat
3. show fail message for unsuccessful generating the merged pdf file
20171210
weight the average of the bin to be closer to the peak of the spectrum represented by bins
20171213
change the definition of sensitivity by (dr*corr(r,f(x,Q)) )/(chi2(ID)/Npt(ID)),
which means normalize the sensitivity by the r(r.m.s.) of the respective ID
note: theoretical uncertainties or deltaR perhaps depend on the tolerent range,
From CT14HERA2NNLO, deltaR is about 0.5,
if we assume theoretical uncertainties for data points follow gaussian distribution,
the gaussian function should not be too broad because the maximum chi^2 is chi^2(min) + torrelant range
Since chi^2 = Sum(r^2), r^2 distribution is an gaussian distribution with the center at 0,
deltaR is like give each point in the gaussian distribution another gaussian flutuation.
The new gaussian distribution still need to satisfy chi^2(min) + T = Sum(r^2)
20171215
update the color palette for sens figs: cut the colors with the same interval
20171217
if any values of points for each flavour are 0, Indeterminate, or \
ComplexInfinity, give values in all replicas of that point 0
20171218:
shift overlapping points in PDFCorrelationplot8
set up the plot type 1 as -1, 0, 1, when -1, legend shows the expt names in the figure, when +1, legend shows the IDs in the figure
20171220
update the color palette setting
users can select 7, 9, 13 colors in palette/4, 5, 6 colors in absolute value palette (Set2DxqBarLegend, Set2DxqRedBarLegend)
sensitivity color become 13
20171220
only output one legend
change the corr/sens symbols to C_f and S_f
20180103:
1. change the title labels in figures to |C_f| for flv(x,Q), etc
2. change the bin center formula in the formula specifying the (x,Q) of data
3. update the quick_data.zip with the CT14HERA2_no_jet, this update does not include
a. 254, 255 for HERA2_no_jet
b. y > 1.0 for ID = 542, 544 of HERA2
this update use bin center = (binup + binlow)/2
20180106
change the 542, 544 in CT14HERA2NNLO to the version including y > 1.0 data
20180117
add the function (MakeMetaDataFile) for making meta data of quick_data
add tools under ./bin/tool: merge quick_data, make/read info table from data info files (corresponding to figures of data)
20180324
change the way to extract the (x,Q) from experimental data,
for x ~ Q*exp(+-y), some x would larger than 1, the way before was deleting the pair (+-y) with anyone > 1,
the new way is to keep the point smaller than 1 and remove another > 1 point.
When doing statistics of correlation/sensitivity value, one experimental data only contribute the weight = 1 value.
if one experimental point specify two points, each point get 1/2 weight so that the total weight = 1
20180328
continue from 0324:
1. for the record of (x,Q) points, record their ipt index in .dta files by ordering
2. change the way to discard specified (x,Q) points: if points are from the same point in .dta files, only discard the point with x>1 (the previous way is discarding all points if anyone satisfies x > 1)
3. when counting total sensitivity and average sensitivity, give points in .dta file weight = 1 and evenly divide into N parts for N points specified by these points. e.g. one point specifies (x1,Q), (x2, Q), then each one get 0.5 weight. if x2>1, then only (x1, Q) left and get 1 weight
4. functions changed: datainfototext, getcorrinfo in corr_proj_funcs.m, selectExptxQv2 in dtareadbotingw2016.m
20180328
update the .tsv file codes, which are used to generate PCA, t-SNE figures in paper 1803.02777
20180328
also include the Npt in plots and Npt of .dta points that have at least one point specified and drawed in plots,
these points may depend on various flavours because each plots of flavours would also discard points that PDF values can not be resolved.
20180409
setup the new mode for the histogram xrange setting for verious plot types in ./bin/histx_auto_config.txt
the code will read xrange from ./bin/histx_auto_config.txt when a. the zmax, zmin are "auto", b. HistAutoMode == 5 in processdataplotsmultiexp7percentage
20180409
modify .tsv output function
if for plot type 2, 3, 4 and residual_norm.tsv, only extract 1 point if there are multiple points specified by a point in .dta files.
we do it for only extracting the raw data in .dta files so that there is no double-counting of residual info in .tsv files
20180409
add logy mode for histogram in processdataplotsmultiexp7percentage
20180417
change the Npttext (the left-right side in plots) from #points in the plot to #points in .dta files
change the default histogram as logy scale
20180424
1. update the function GetResidualRMS for calculating the rms of residuals in raw data (.dta files)
2. fix the color palette problem: when plotting the signed data, not every number label are shown
3. for making info files, don't remove the 0 value data points because they are also considered in the total |S| calculation
(for points specified by one raw point, |S| = (|S1|+|S2|)/2, if |S| = 0 (not well-defined), we still take it into account)
20180425
1. replace the data for filling in histograms, weighting the counts of points sharing the same raw data point by 1/N,
where N is the #pt sharing the same raw point
the impact is that the t
2. update the functions to processdataplotsmultiexp8percentage and histplot6 for the weight of histograms
20180430
fix a small bug for outputting correlation .m files
20180512
modification of the user_func.txt reading (ReadUserFunctionV3 in corr_proj_funcs.nb/.m)
if the input username is a Mathematica expression that output a string, then read this username as an expression
this update is for inputting special characters, users can type the special characters and translate to InputForm
in Mathematica, then paste it to the user name in the user_func.txt
e.g. type a string with special character "xxx"//InputForm, then you will out a string like
"\[LeftAngleBracket]\!\(\*SuperscriptBox[\(x\), \(0\)]\)\[RightAngleBracket]g"
You paste it after "Name:" in user_func.txt, then the ReadUserFunctionV3 will translate it to the "xxx" you input in Mathematica
20180627
revise the README and tutorial (to v16.2) for making the customized database part
revise error messages in ExptIDEcm, ExptIDprocess, selectExptxQv2 of dtareadbotingw2016.nb(.m)