-
Notifications
You must be signed in to change notification settings - Fork 0
/
diffs.tex
3996 lines (3146 loc) · 379 KB
/
diffs.tex
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
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
\documentclass[ALICE,manyauthors]{cernphprep}
%DIF LATEXDIFF DIFFERENCE FILE
%DIF DEL /home/rschotte/Documents/Latex Documents/PhDThesis_v1/Master.tex Fri May 5 20:55:54 2023
%DIF ADD Master.tex Tue May 16 15:25:03 2023
%\documentclass[12pt,oneside,a4paper]{book} % This style for A4 format.
\newpage
%_____________________________________________________________________________________
%Pour les documentations sur les differents packages, voir le TeX catalogue on line
% http://texcatalogue.sarovar.org/index.html,
%_____________________________________________________________________________________
\usepackage[T1]{fontenc}
% for output font rendering, T1 rendering
% textsc into section title http://en.wikibooks.org/wiki/LaTeX/Fonts#Font_encoding
\usepackage{lmodern}
%\usepackage[varg]{txfonts} % Web of Conferences font
% choose specific font, lmodern (default : if installed = cm-super, rendering ok!)
% There is nothing to change in your document to use CM Super fonts (assuming they are installed),
% they will get loaded automatically if you use T1 encoding.
% For lmodern, you will need to load the package after the T1 encoding has been set
%\usepackage[latin1]{inputenc}
\usepackage[utf8]{inputenc} % for input source code, accented characters like French spelling...
\usepackage{graphicx,subfigure}
%\usepackage{subcaption} %for subfigures, added 10.dec.20
%\usepackage[english,francais]{babel}
\usepackage{amsmath}
\usepackage{amssymb} % boldsymbol, special characters
\usepackage{mathrsfs} % pour le L du lagrangien ...
\usepackage{MnSymbol} % pour fivedots
\usepackage{bbding} % pour checkmark spéciaux dans tableau d'inventaire
\usepackage{dictsym} % pour dsaagricultural du tableau d'inventaire
\usepackage{manfnt} % pour le signe "virage dangereux" \textlhdbend
%\usepackage{marvosym} % Special Fonts, if need be. http://texdoc.net/texmf-dist/doc/fonts/marvosym/marvodoc.pdf
% \usepackage{eurosym} % symbole de l'euro, \officialeuro
% \DeclareUnicodeCharacter{20AC}{\euro} % i.e. make the translation € UTF-8 char to be the LaTeX € symbol
\usepackage[retainorgcmds]{IEEEtrantools} % equation à la IEEE
\usepackage{multirow}
\usepackage{xspace}
\usepackage{lineno} % for line numbering
%\usepackage[showframe=false]{geometry}
\usepackage{changepage} % for managing locally the width allowed for the text = useful for shifting leftwards too wide tables or figure
% e.g. \begin{adjustwidth}{-1cm}{} ... \end{adjustwidth}
\usepackage{threeparttable} % for enabling footnote within a table
\usepackage{pdflscape} % Rotation of tables (better handling), for pdflatex
\usepackage{dcolumn} % to align column on the decimal point
\usepackage{enumitem} % to be able to have enumerate a,b... A,B... i,ii...
% \begin{enumerate}[label=(\alph*)], [label=(\Alph*)], [label=(\roman*)]
\usepackage[normalem]{ulem} % pour tuner le soulignage, [normalem] = pour préserver le comportement normale de emph
\usepackage{longtable}
\usepackage{float}
\usepackage{cellspace, tabularx, booktabs}
%\usepackage{garamondx}
\addparagraphcolumntypes{X}
\usepackage{ifthen} % execute code with condition
\usepackage{nicefrac} % to get nice fractions of type x / y
\usepackage{indentfirst}
\usepackage{titlesec} % controls title spacing
\titlespacing{\section}{0pt}{4.5ex plus 1ex minus .2ex}{2.3ex plus .2ex}
\titlespacing{\subsection}{0pt}{4.5ex plus 1ex minus .2ex}{2.3ex plus .2ex}
\titlespacing{\subsubsection}{0pt}{4.5ex plus 1ex minus .2ex}{2.3ex plus .2ex}
\usepackage{feynmp-auto} %to draw Feyman diagram
\usepackage{feynmp}
\DeclareGraphicsRule{*}{mps}{*}{}
%\setlength{\unitlength}{1cm}
% after babel
\usepackage{datetime} % pour afficher l'heure avec la commande \currenttime = \xxivtime
\usepackage{sidecap}
\usepackage{afterpage}
%DIF 76a76-77
\usepackage{dirtytalk} %DIF >
\usepackage{textcomp} %DIF >
%DIF -------
%%%%%%%%%%%%%package Romain
% \usepackage[lofdepth,lotdepth,caption=false]{subfig}
% FIXME pb incompatible with hyperref apparently, enable to compile the document locally
% https://tex.stackexchange.com/questions/129791/using-subfloat-with-hyperref
%%%%%%%%%%%%%end package Romain
% Package nécessaire pour les remerciements
% \usepackage{endnotes}
% \renewcommand{\notesname}{Notes de remerciements}
%%% OPTION - pdflatex compiler
\usepackage[pdftex,usenames,dvipsnames]{xcolor}
%\usepackage{xcolor}
%\usepackage[pdftex]{graphicx}
\usepackage{eso-pic,graphicx, transparent}
\usepackage{epstopdf}
\DeclareGraphicsExtensions{.jpg,.eps,.png,.pdf}
%%% OPTION - Latex compiler
% \usepackage[usenames,dvipsnames]{color}
% \usepackage[dvips]{graphicx}
% \DeclareGraphicsExtensions{.jpg,.eps,.pdf,.png}
% %\DeclareGraphicsRule{.jpg}{eps}{.jpg.bb}{`./jpeg2ps/jpeg2ps -h #1}
% % % Truc de Julien : permet d'inclure des jpg au lieu d'eps ("wrapper" des jpeg en PS Level 2)
% % % Particulièrement utile pour les fichiers images volumineux
% % % Voir également le shell script Jpg-DoBdngBox.sh et les fichiers *.jpg.bb
%
% % \DeclareGraphicsRule{.eps.zip}{eps}{.eps.bb}{`unzip -p #1}% zipped EPS
% % \DeclareGraphicsRule{.eps.gz}{eps}{.eps.bb}{`gunzip -c #1}% gzipped EPS
% % \DeclareGraphicsRule{.jpg}{eps}{.jpg.bb}{`convert #1 eps:-}% JPEG
% % \DeclareGraphicsRule{.gif}{eps}{gif.bb}{`convert #1 eps:-}% GIF
% \DeclareGraphicsRule{.png}{eps}{.png.bb}{`convert #1 eps:-}% PNG
% % \DeclareGraphicsRule{.tif}{eps}{.bb}{`convert #1 eps:-}% TIFF
% \DeclareGraphicsRule{.pdf}{eps}{.pdf.bb}{`convert #1 eps:-}% PDF-graphics
\usepackage[bookmarks]{hyperref}
% NOTE :
% For colour choices : https://en.wikibooks.org/wiki/LaTeX/Colors
\makeatletter
\Hy@AtBeginDocument{%
\def\@pdfborder{0 0 1}% Overrides border definition set with colorlinks=true
\def\@pdfborderstyle{/S/S/W 1}% Overrides border style set with colorlinks=true
% Hyperlink border style will be framed of width 1pt
% https://tex.stackexchange.com/questions/26071/how-can-i-have-colored-and-underlined-links-with-hyperref
}
\makeatother
\hypersetup{colorlinks=true,
% NOTE:
% - to have coloured frames + have coloured links, uncomment l.89+90 above and colorlinks=true
% - to have coloured frames + kill coloured links, comment l.89+90 above and colorlinks=false
% - to kill coloured frames + have coloured links, comment l.89+90 above and colorlinks=true
% See https://tex.stackexchange.com/questions/50747/options-for-appearance-of-links-in-hyperref
linktocpage,
citebordercolor=ForestGreen,
linkbordercolor=Red,
urlbordercolor=Cerulean,
% menubordercolor= [rgb 1 0 0]
% filebordercolor= [rgb 0 .5 .5]
% runbordercolor= [rgb 0 .7 .7]
%allbordercolors=Red
citecolor=MidnightBlue,
filecolor=MidnightBlue,
linkcolor=MidnightBlue,
urlcolor=MidnightBlue}
% \hypersetup{colorlinks, linktocpage, citecolor=Gray, filecolor=Gray, linkcolor=Gray, urlcolor=Gray} %FIXME : N&B
\urlstyle{sf} % change the url font for sans serif sf, else rm
\usepackage[comma,square,numbers,sort&compress]{natbib}
% \usepackage[numbers, sort&compress]{mynatbib} %pour avoir une génération automatique de réf. bib [1-6] au lieu de lister [1, 2, 3, 4, 5, 6].
% \usepackage{hypernat}
% L'usage de mynatbib = version locale modifiée de natbib est fait pour
% empêcher la réinterprétation de la commande \newblock de la bibliographie
% En conséquence, tout ce qui est \newblock dans natbib.sty = changer pour "\\"
\usepackage{array}
%pour avoir \extrarowheight = gestion de la hauteur de ligne (voir chap. 4)
% Ajout de hauteur suppl aux lignes pour éviter que la ligne horizontale ne touche le texte.
% \setlength{\extrarowheight}{3 pt} %à mettre au dessus du tableau considérée. 0 pt = valeur par défaut
%Option m{largeur colonne} permet de centrer le texte verticalement (package array)
\usepackage{textpos} % pour la realisation de la page de titre
\setlength{\TPHorizModule}{10mm}
\setlength{\TPVertModule}{10mm}
% definition de l'unite de base de longueur pour le placement avec textpos
\usepackage{epigraph} %allow rajout d'epigraphe (voir conclusion pour exemple)
\setlength{\epigraphwidth}{80mm}
\renewcommand{\epigraphsize}{\footnotesize}
%\usepackage{fancyhdr} %modification des bas de pages et en-tetes
%\usepackage{tocbibind} %allow integration de biblio+index dans la TOC(a comparer avec addcontentsline)
%\usepackage{bibunits} %permet de faire une biblio par partie, chapitre, section...
%__________ Redefine style of the header top line, with section names
\def\MakeUppercase#1{{ \textsf{\small #1} }}
% MakeUppercase is already defined into LaTeX
%__________Mise en place des \newcommand generales
%\newcommand{\Bluecite}[1]{\textcolor{Blue}{\cite{#1}}}
\newcommand{\BoldSubSection}[1]{\noindent \textbf{\textsl{#1}}\\ \addcontentsline{toc}{subsection}{ \textsl{\textcolor{Gray}{\small #1 }}} }
\newcommand{\SlantedSubSubSection}[1]{ -- \textsl{#1}\\ \addcontentsline{toc}{subsubsection}{ \textsl{\textcolor{Gray}{\small #1 }}} }
\newcommand{\urlscpt}[1]{\hbox{\scriptsize \url{#1}}}
% reduce the size of Internet address
\newcommand{\refmark}[1]{\hbox{\scriptsize $^{\ref{#1}}$}}
%pour pouvoir faire une référence multiple a une note de bas de page
% voir exemple dans le chap. 4
\renewcommand\descriptionlabel[1]{\hspace\labelsep\normalfont\itshape #1 :}
%in the environment "description", produce labels in italic, with colon at the end
% write roman numbers in your text in lowercase or uppercase
\newcommand{\upperRomannumeral}[1]{\uppercase\expandafter{\romannumeral#1}}
\newcommand{\lowerromannumeral}[1]{\romannumeral#1\relax}
%\renewcommand{\newblock}{\\}
% pour revenir à la ligne après chaque bloc, dans la bibliographie = réinterpréter newblock en \\
\newenvironment{BulletList}%
{ \begin{list}%
{$\bullet$}%
{\setlength{\labelwidth}{30pt}%
\setlength{\leftmargin}{35pt}%
\setlength{\itemsep}{\parsep}%
\setlength{\topsep}{\parsep}}}
{ \end{list} }
%__________Definition of colours
% http://cloford.com/resources/colours/500col.htm
% in gray shades
\definecolor{DarkGray}{RGB}{60,60,60}
\definecolor{LightGray}{RGB}{145,145,145}
% in red shades
\definecolor{Sepia}{RGB}{94,38,18}
\definecolor{IndianRed}{RGB}{176,23,31}
\definecolor{OrangeRed4}{RGB}{139,37,0}
\definecolor{DarkRed}{RGB}{139,0,0}
% in orange shades
\definecolor{Orange2}{RGB}{238,154,0}
\definecolor{Goldenrod1}{RGB}{255,193,37}
\definecolor{Goldenrod2}{RGB}{238,180,34}
% in blue shades
\definecolor{DarkSlateBlue}{RGB}{72,61,139}
\definecolor{Cobalt}{RGB}{61,89,171}
\definecolor{RoyalBlue4}{RGB}{39,64,139}
\definecolor{DodgerBlue4}{RGB}{16,78,139}
\definecolor{SteelBlue4}{RGB}{54,100,139}
\definecolor{DeepSkyBlue4}{RGB}{0,104,139}
% in green shades
\definecolor{LightGreen}{RGB}{0,200,0}
%__________Insertion of source codes
\usepackage{listings}
% In order to include source code from various prog language
% For documentation :
% http://en.wikibooks.org/wiki/LaTeX/Source_Code_Listings
% http://www.ctan.org/tex-archive/macros/latex/contrib/listings/
\lstset{ %
backgroundcolor=\color{white}, % choose the background color; you must add \usepackage{color} or \usepackage{xcolor}
basicstyle=\footnotesize\ttfamily, % the font and size that are used for the code
breakatwhitespace=false, % sets if automatic breaks should only happen at whitespace
breaklines=true, % sets automatic line breaking
captionpos=t, % sets the caption-position to top
commentstyle=\color{LightGray}\upshape, % comment style
deletekeywords={...}, % if you want to delete keywords from the given language
%escapeinside={\%*}{*)}, % if you want to add LaTeX within your code
extendedchars=true, % lets you use non-ASCII characters; for 8-bits encodings only, does not work with UTF-8
frame=tlbr, % adds a frame around the code : single, t b l r, T B L R
keepspaces=false, % keeps spaces in text, useful for keeping indentation of code (possibly needs columns=flexible)
keywordstyle=\bfseries\color{black}, % keyword style
identifierstyle=,
language=C, % the default language of the code
%morekeywords={*,...}, % if you want to add more keywords to the set
numbers=left, % where to put the line-numbers; possible values are (none, left, right)
numbersep=8pt, % how far the line-numbers are from the code
numberstyle=\tiny\color{LightGray}, % the style that is used for the line-numbers
rulecolor=\color{LightGray}, % if not set, the frame-color may be changed on line-breaks within not-black text (e.g. comments (green here))
showspaces=false, % show spaces everywhere adding particular underscores; it overrides 'showstringspaces'
showstringspaces=false, % underline spaces within strings only
showtabs=false, % show tabs within strings adding particular underscores
stepnumber=1, % the step between two line-numbers. If it's 1, each line will be numbered
stringstyle=\color{Goldenrod2}, % string literal style
tabsize=2, % sets default tabsize to 2 spaces
caption=\lstname, % show the filename of files included with \lstinputlisting; also try caption instead of title
xleftmargin=10pt, % size of the left margin
belowcaptionskip=1.2\baselineskip,
aboveskip=1\baselineskip, % vertical skip above the listings envt
belowskip=1\baselineskip,
}
\lstdefinestyle{customC++}{
language=C++
}
\lstdefinestyle{customBash}{
language=bash
}
\lstdefinestyle{customCmnd}{
language=sh,
identifierstyle=\color{blue},
morecomment=[l][\color{LightGray}]{!\ } % define the rest of the whole line as comments
}
% look-up table to have the listings package fully compatible with UTF-8 extended char (extendedchars has to be true).
\lstset{literate=
{á}{{\'a}}1 {é}{{\'e}}1 {í}{{\'i}}1 {ó}{{\'o}}1 {ú}{{\'u}}1
{Á}{{\'A}}1 {É}{{\'E}}1 {Í}{{\'I}}1 {Ó}{{\'O}}1 {Ú}{{\'U}}1
{à}{{\`a}}1 {è}{{\'e}}1 {ì}{{\`i}}1 {ò}{{\`o}}1 {ò}{{\`u}}1
{À}{{\`A}}1 {È}{{\'E}}1 {Ì}{{\`I}}1 {Ò}{{\`O}}1 {Ò}{{\`U}}1
{ä}{{\"a}}1 {ë}{{\"e}}1 {ï}{{\"i}}1 {ö}{{\"o}}1 {ü}{{\"u}}1
{Ä}{{\"A}}1 {Ë}{{\"E}}1 {Ï}{{\"I}}1 {Ö}{{\"O}}1 {Ü}{{\"U}}1
{â}{{\^a}}1 {ê}{{\^e}}1 {î}{{\^i}}1 {ô}{{\^o}}1 {û}{{\^u}}1
{Â}{{\^A}}1 {Ê}{{\^E}}1 {Î}{{\^I}}1 {Ô}{{\^O}}1 {Û}{{\^U}}1
{œ}{{\oe}}1 {Œ}{{\OE}}1 {æ}{{\ae}}1 {Æ}{{\AE}}1 {ß}{{\ss}}1
{ç}{{\c c}}1 {Ç}{{\c C}}1 {ø}{{\o}}1 {å}{{\r a}}1 {Å}{{\r A}}1
{€}{{\EUR}}1 {£}{{\pounds}}1
}
%__________Mise en place de la structure en chap., section ... + toc
\renewcommand{\thepart} {\Alph{part}.}
%\renewcommand{\thechapter} {\Roman{chapter}}
\renewcommand{\thesection} {\Roman{section}}
\renewcommand{\thesubsection} {~~\thesection-{\small \Alph{subsection}}}
\renewcommand{\thesubsubsection} {~~~~\thesection-{\small \Alph{subsection}}.{\footnotesize \roman{subsubsection}}}
% pour avoir une structure du type "I.A -1.i" au lieu de "1.1.1.1"
% TOC normal
\setcounter{tocdepth}{3} % Arret au niveau des subsubsection
\setcounter{secnumdepth}{3} % Arret de la numerotation au niveau des subsubsections
% - 1.
\usepackage{titlesec}
% definition utilisateur du style des chap., sections, ...
\usepackage{etoolbox}
% Bug in sectionning : plus de numéros apparent dans le texte
% Fix = http://tex.stackexchange.com/questions/299969/titlesec-loss-of-section-numbering-with-the-new-update-2016-03-15
\makeatletter
\patchcmd{\ttlh@hang}{\parindent\z@}{\parindent\z@\leavevmode}{}{}
\patchcmd{\ttlh@hang}{\noindent}{}{}{}
\makeatother
%font style = \sffamily, \ttfamily, \rmfamily
%font series = \bfseries, \mdseries
%font shape = \upshape, \itshape, \scshape, \slshape
% http://www.math.jussieu.fr/~goutet/latex/seance_6/seance_6.pdf
%\titleclass{\part}{straight}
\titleformat{\part}[display]
{\normalfont\sffamily\huge\bfseries\color{OrangeRed4}}
% FIXME {\normalfont\sffamily\huge\bfseries\color{Black}}
{-- \partname\ \thepart}{20pt}{\Huge}
% \titleformat{\chapter}[display]
% {\normalfont\sffamily\huge\bfseries\color{Sepia}}
% % FIXME {\normalfont\sffamily\huge\bfseries\color{Black}}
% {-- \chaptertitlename\ \thechapter~-- }{20pt}{\Huge}
% Title format: chapter
\titleformat{\chapter}[display]
{\fontsize{30}{20}\selectfont\bfseries\filright}
{\chaptertitlename}
{20pt}
{
\ifthenelse{\thechapter>0}
{\fontsize{60}{0}\selectfont\thechapter\hspace{0pt}\hspace{2mm}{| }\hspace{0pt}}
{\hspace{0pt}}
\fontsize{30}{60}\bfseries
}
%\titleclass{\section}{straight}
\titleformat{\section}[hang]
% {\normalfont\rmfamily\Large\bfseries\color{OrangeRed4}}
{\normalfont\rmfamily\Large\bfseries\color{RoyalBlue4}}
% FIXME {\normalfont\rmfamily\Large\bfseries\color{Black}}
{\thesection}{1em}{}
\titleformat{\subsection}[hang]
{\normalfont\rmfamily\large\bfseries\color{DarkGray}}
% FIXME {\normalfont\rmfamily\large\bfseries\color{Black}}
{\thesubsection}{1em}{}
\titleformat{\subsubsection}[hang]
{\normalfont\rmfamily\large\bfseries\color{DarkGray}}
% FIXME {\itshape\rmfamily\large\bfseries\color{Black}}
{\thesubsubsection}{1em}{}
% - 2.
\usepackage{titletoc}
% definition utilisateur du style du TOC ...
\titlecontents{part}%
[2em]% retrait à gauche
{\addvspace{5em plus 0pt}\flushright\bfseries\color{MidnightBlue}}% matériel avant commun aux entrées numérotées ou pas
{\contentslabel{2.0em}}% avant lorsqu'il y a un numéro
{\hspace{-2.0em}}% avant lorsqu'il n'y a pas de numéro
{}% points de suspension et numéro de page
[\addvspace{2em}]% matériel après
\titlecontents{chapter}%
[2.5em]% retrait à gauche
{\addvspace{3em plus 0pt}\bfseries}% matériel avant commun aux entrées numérotées ou pas
{\contentslabel{2.5em}}% avant lorsqu'il y a un numéro
{\hspace{-2.5em}}% avant lorsqu'il n'y a pas de numéro
{\dotfill\contentspage}% points de suspension et numéro de page
[\addvspace{0pt}]% matériel après
\titlecontents{section}%
[4.5em]% retrait à gauche
%{\addvspace{8pt}\mdseries\color{OrangeRed4}}% matériel avant commun aux entrées numérotées ou pas
{\addvspace{8pt}\mdseries\color{RoyalBlue4}}% matériel avant commun aux entrées numérotées ou pas
{\contentslabel{3.5em}}% avant lorsqu'il y a un numéro
{\hspace{-3.5em}}% avant lorsqu'il n'y a pas de numéro
{\dotfill\contentspage}% points de suspension et numéro de page
[\addvspace{0pt}]% matériel après
\titlecontents{subsection}%
[5.5em]% retrait à gauche
{\mdseries\color{DarkGray}}% matériel avant commun aux entrées numérotées ou pas
{\contentslabel{4.5em}}% avant lorsqu'il y a un numéro
{\hspace{-4.5em}}% avant lorsqu'il n'y a pas de numéro
{\dotfill\contentspage}% points de suspension et numéro de page
[\addvspace{-0pt}]% matériel après
\titlecontents{subsubsection}%
[6.5em]% retrait à gauche
{\mdseries\mdseries\color{DarkGray}}% matériel avant commun aux entrées numérotées ou pas
{\contentslabel{5.5em}}% avant lorsqu'il y a un numéro
{\hspace{-5.5em}}% avant lorsqu'il n'y a pas de numéro
{\dotfill\contentspage}% points de suspension et numéro de page
[\addvspace{-0pt}]% matériel après
% - 3 : Corrections nécessaires pour les TOC partiels
\makeatletter
\AtBeginDocument{%
\def\ttl@gobblecontents#1#2#3#4{\ignorespaces}%
}
\makeatother
% - 4 : Correction nécessaire pour améliorer la référence à une (sous-sous-)section
%\newcommand{\refSection}[1]{\mbox{\kern-0.1em \ref{#1}}}
\newcommand{\refSubSection}[1]{\mbox{\kern-0.6em \ref{#1}}}
\newcommand{\refSubSubSection}[1]{\mbox{\kern-1.2em \ref{#1}}}
% suite à la redéfinition du style de la hiérarchie (II.A.1.i)
% faire référence à un paragraphe laisse beaucoup d'espace devant la référence : "Dans le paragaphe I.C.2.i"
%__________Option de draft : Définition de la version
\newcommand{\version}[2]{ [Version {#1} - {\scriptsize (git rev.{#2})} - \today, \currenttime] }
% _____ Option 1 - Simple
% to get a light mark in the diagonal of every page
% drawback : for people commenting on the pdf, the diagonal can mess up
% the selection of words you would like to comment on.
% Said to be inconvenient.
% \usepackage{draftwatermark}
% \SetWatermarkLightness{0.90}
% \SetWatermarkAngle{90}
% \SetWatermarkScale{0.3}
% \SetWatermarkText{\today, \currenttime}
% _____ Option 2 - More complex : to get the draftwatermark in the right margin = https://ctan.org/pkg/background
\usepackage[color=gray]{background}
\backgroundsetup{
position={+8.7cm,-6cm},
firstpage=true, % does not work here apparently
angle=-90,
opacity=0.5,
scale=2,
%contents=Draft % the exact text is set in the master document
}
%__________Option de draft : notes en marge
\usepackage[colorinlistoftodos]{todonotes} % disable, obeyDraft, obeyFinal
\pagestyle{headings}
\newpage
\newpage
%_____________________________________________________________________________________
%Pour les documentations sur les differents packages, voir le TeX catalogue on line
% http://texcatalogue.sarovar.org/index.html,
%_____________________________________________________________________________________
%__________Definition of scientific commands
%
% 1 - some text editions
%
\makeatletter
\newcommand{\dashover}[2][\mathop]{#1{\mathpalette\df@over{{\dashfill}{#2}}}}
\newcommand{\fillover}[2][\mathop]{#1{\mathpalette\df@over{{\solidfill}{#2}}}}
\newcommand{\df@over}[2]{\df@@over#1#2}
\newcommand\df@@over[3]{%
\vbox{
\offinterlineskip
\ialign{##\cr
#2{#1}\cr
\noalign{\kern1pt}
$\m@th#1#3$\cr
}
}%
}
\newcommand{\dashfill}[1]{%
\kern-.5pt
\xleaders\hbox{\kern.5pt\vrule height.4pt width \dash@width{#1}\kern.5pt}\hfill
\kern-.5pt
}
\newcommand{\dash@width}[1]{%
\ifx#1\displaystyle
2pt
\else
\ifx#1\textstyle
1.5pt
\else
\ifx#1\scriptstyle
1.25pt
\else
\ifx#1\scriptscriptstyle
1pt
\fi
\fi
\fi
\fi
}
\newcommand{\solidfill}[1]{\leaders\hrule\hfill}
\makeatother
\newcommand {\stat} {({\it stat.})~}
\newcommand {\syst} {({\it syst.})~}
\newcommand{\ie} {$i.e.$~}
\newcommand{\eg} {$e.g.$~}
\newcommand{\Eg} {$E.g.$~}
\newcommand{\Fig} {\textsc{f}ig.~}
\newcommand{\fig} {\Fig}
\newcommand{\Figs} {\textsc{f}igs.~}
\newcommand{\figs} {\Figs}
\newcommand{\Figure} {\textsc{f}igure~}
\newcommand{\Figures} {\textsc{f}igures~}
\newcommand{\Tab} {\textsc{t}ab.~}
\newcommand{\tab} {\Tab}
\newcommand{\Table} {\textsc{t}able~}
\newcommand{\Tables} {\textsc{t}ables~}
\newcommand{\chap} {\textsc{c}hap.~}
\newcommand{\Chapter} {\textsc{c}hapter~}
\newcommand{\Chapters} {\textsc{c}hapters~}
\newcommand{\parag} {\textsc{p}ar.~}
\newcommand{\appdx} {\textsc{a}pp.~}
\newcommand{\eq} {\textsc{e}q.~}
\newcommand{\opt} {\textsc{o}pt.~}
\newcommand{\Sec} {\textsc{S}ec.~}
\newcommand{\tune} {\emph{tune}}
\newcommand{\tunes} {\emph{tunes}\xspace}
\newcommand{\orderOf}[1]{\ensuremath{\mathcal{O}}(#1)}
\newcommand{\CheckGr} {\textcolor{Green}{\normalsize \CheckmarkBold}}
\newcommand{\SurpriseGr}{\textcolor{Green}{\textbf{!}{\scriptsize !}}}
\newcommand{\Wtf} {\textcolor{IndianRed}{\textbf{?}!}}
\newcommand{\NB} {\textcolor{IndianRed}{\HandRight}}
\newcommand{\Caution} {\textcolor{IndianRed}{\scriptsize \textlhdbend}}
\newcommand{\NoWay} {\textcolor{IndianRed}{\normalsize \XSolidBrush}\xspace}
\newcommand{\UnderWork} {\textcolor{Blue}{\Large \dsagricultural}}
\newcommand{\ToDo} {\textcolor{Gray}{\scriptsize \textsc{ToDo}}}
%
% 2 - some notations
%
% \text{} is more general than \mahtrm{} :
% it does not switch font to roman but just use the given font and write it straight (especially needed into title, sections..).
% http://tex.stackexchange.com/questions/98406/which-command-should-i-use-for-textual-subscripts-in-math-mode
% 2.1 - Physics quantities
\newcommand {\pT} {\ensuremath{p_{\text{\textsc{t}}}}\xspace}
% \DeclareRobustCommand {\pT} {\ensuremath{p_{\text{\textsc{t}}}}}
\newcommand {\pZ} {\ensuremath{p_{\text{\textsc{z}}}}}
\newcommand {\pTlw} {\ensuremath{p_{\text{\textsc{t}}}^{lw} }}
\newcommand {\pTIdx}[1] {\ensuremath{p_{\text{\textsc{t},#1}}}}
\newcommand {\pTExp}[1] {\ensuremath{p_{\text{\textsc{t}}}^{#1}}}
\newcommand {\pTIdxExp}[2] {\ensuremath{p_{\text{\textsc{t},#1}}^{#2}}}
\newcommand {\pTof}[1] {\ensuremath{p_{\text{\textsc{t}}} \text{(#1)}}}
\newcommand {\pTchJet} {\ensuremath{p_{\text{\textsc{t},jet}}^{\text{ch}}}}
\newcommand {\pTchEmJet} {\ensuremath{p_{\text{\textsc{t},jet}}^{\text{ch+em}}}}
\newcommand {\sigmapT} {\mbox{$\sigma_{\pT}$}}
\newcommand {\meanpT} {\ensuremath{\langle p_{\textsc{t}} \kern-0.1em\rangle}}
\newcommand {\mean}[1] {\ensuremath{\langle #1 \kern-0.1em\rangle}}
\newcommand {\sqrtSnn} {\ensuremath{\sqrt{s_\text{\textsc{nn}}}}}
\newcommand {\sqrtS} {\ensuremath{\sqrt{s}}\xspace}
\newcommand {\vTwo} {\ensuremath{v_{\text{2}}}}
\newcommand {\vThree} {\ensuremath{v_{\text{3}}}}
\newcommand {\vFour} {\ensuremath{v_{\text{4}}}}
\newcommand {\vFive} {\ensuremath{v_{\text{5}}}}
\newcommand {\vSix} {\ensuremath{v_{\text{6}}}}
\newcommand {\vN} {\ensuremath{v_{\text{n}}}}
\newcommand {\eT} {\ensuremath{E_{\text{\textsc{t}}}}}
\newcommand {\mT} {\ensuremath{m_{\text{\textsc{t}}}}}
\newcommand {\mTmZero} {\ensuremath{m_{\text{\textsc{t}}} - m_0}}
\newcommand {\mInvIdx}[1] {\ensuremath{m_{ \textsc{#1} }}}
\newcommand {\mPart}[1] {\mbox{$m[ #1 ]$}}
\newcommand {\sigmaM}[1] {\mbox{$\sigma_m[ #1 ]$}}
\newcommand {\DeltaM}[1] {\mbox{$\Delta m[ #1 ]$}}
\newcommand {\sigmaIdx}[1] {\ensuremath{\sigma_{ #1 }}}
\newcommand {\sigmaPDG} {\ensuremath{\sigma_{\textsc{pdg}}}\xspace}
\newcommand {\Nsigma}[1] {\ensuremath{n.\sigma_{ #1 }}}
\newcommand {\rap} {\mbox{$y$}}
\newcommand {\rapLab} {\mbox{$y_{\text{lab}}$}}
\newcommand {\rapCms} {\mbox{$y_{\text{\textsc{cms} }}$}}
\newcommand {\absrap} {\mbox{$\left | y \right | $}}
\newcommand {\rapPart}[1] {\mbox{$\left | y\text{(#1)} \right | $}}
\newcommand {\rapXi} {\mbox{$\left | y(\rmXi) \right | $}}
\newcommand {\rapJpsi} {\mbox{$y_{\tiny \rmJpsi}$}}
\newcommand {\abspseudorap} {\mbox{$\left | \eta \right | $}}
\newcommand {\pseudorap} {\mbox{$\eta$}}
\newcommand {\pseudorapLab} {\mbox{$\eta_{\,\text{lab}}$}}
\newcommand {\pseudorapCms} {\mbox{$\eta_{\text{\textsc{cms} }}$}}
\newcommand {\cTau} {\ensuremath{c.\tau}\xspace}
\newcommand {\sigee} {$\sigma_E$/$E$}
\newcommand {\AxEff} {\ensuremath{\mathscr{A}.\varepsilon}}
\newcommand {\dd} {\mathop{}\!\text{d}}
\newcommand {\oneOverpipT} {\ensuremath{1/2\pi\pT}}
\newcommand {\crossSec}[1] {\mbox{$\sigma_{\scriptsize \rm #1}$}}
\newcommand {\visCrossSec}[1] {\mbox{$\sigma_{\scriptsize \rm #1}^{visible}$}}
\newcommand {\dsigmady} {\ensuremath{\text{d}\sigma/\text{d}y}}
\newcommand {\dsigmadpt} {\ensuremath{\text{d}^{2}\sigma/\text{d}\pT}}
\newcommand {\dsigmadptdy} {\ensuremath{\text{d}^{2}\sigma/\text{d}\pT\text{d}y}}
\newcommand {\dsigmadptdeta}{\ensuremath{\text{d}^{2}\sigma/\text{d}\pT\text{d}\eta}}
\newcommand {\dsigmaXdy}[1] {\ensuremath{\text{d}\sigma\text{(#1)}/\text{d}y}}
\newcommand {\dsigmaXdpt}[1]{\ensuremath{\text{d}\sigma\text{(#1)}/\text{d}\pT}}
\newcommand {\dsigmaXdptdy}[1] {\ensuremath{\text{d}^{2}\sigma\text{(#1)}/\text{d}\pT\text{d}y}}
\newcommand {\dNdy} {\ensuremath{\text{d}N/\text{d}y}}
\newcommand {\dNdeta} {\ensuremath{\text{d}N/\text{d}\eta}\xspace}
\newcommand {\dNXdy}[1] {\ensuremath{\text{d}N\text{(#1)}/\text{d}y}}
\newcommand {\dNJpsidy} {\dNXdy{\rmJpsi}}
\newcommand {\dNdpt} {\ensuremath{\text{d}N/\text{d}\pT }}
\newcommand {\dNXdptdy}[1] {\ensuremath{\text{d}^{2}N\text{(#1)}/\text{d}\pT\text{d}y}}
\newcommand {\dNdptdy} {\ensuremath{\text{d}^{2}N/\text{d}\pT\text{d}y }}
\newcommand {\dNdptdeta} {\ensuremath{\text{d}^{2}N/\text{d}\pT\text{d}\eta }}
\newcommand {\fracdsigmadptdy} {\ensuremath{ \frac{\text{d}^{2}\sigma}{\text{d}\pT\text{d}y}}}
\newcommand {\fracdNdptdy} {\ensuremath{ \frac{\text{d}^{2}N}{\text{d}\pT\text{d}y } }}
\newcommand {\fracdNdy} {\ensuremath{ \frac{\dN}{\dy}}}
\newcommand {\fracdNdyBold} {\ensuremath{ \frac{\bm{\dN}}{\bm{\dy}}}}
\newcommand {\dNXdX}[2] {\ensuremath{ \frac{\dN_{\textsc{#1}}}{{\text{d}\textsc{#2}}} }}
\newcommand {\dNdmtdy} {\ensuremath{\text{d}^{2}N/\text{d}\mT\text{d}y }}
\newcommand {\dN} {\ensuremath{\text{d}N }}
\newcommand {\Npp} {\ensuremath{N_{\textsc{\pp}}}}
\newcommand {\dNsquared} {\ensuremath{\text{d}^{2}N }}
\newcommand {\dsquared} {\ensuremath{\text{d}^{2} }}
\newcommand {\dpT} {\ensuremath{\text{d}\pT }}
\newcommand {\dy} {\ensuremath{\text{d}y}}
\newcommand {\dNdyBold} {\ensuremath{\bm{\dN/\dy}}}
\newcommand {\dNchdy} {\ensuremath{\text{d}N_\text{ch}/\text{d}y }}
\newcommand {\dNchdeta} {\ensuremath{\text{d}N_\text{ch}/\text{d}\eta }}
\newcommand {\dNchdptdeta} {\ensuremath{\text{d}^{2}N_\text{ch}/\text{d}\pT\text{d}\eta }}
\newcommand {\RAA} {\ensuremath{R_\text{AA}}}
\newcommand {\RpA} {\ensuremath{R_\text{pA}}}
\newcommand {\RpPb} {\ensuremath{R_\text{pPb}}}
\newcommand {\RPbp} {\ensuremath{R_\text{Pbp}}}
\newcommand {\RAuAu} {\ensuremath{R_\text{AuAu}}}
\newcommand {\RPbPb} {\ensuremath{R_\text{PbPb}}}
\newcommand {\Rcp} {\ensuremath{R_\text{CP}}}
\newcommand {\hPMVzsCorrel} {\ensuremath{(\text{\hPM-V0})}}
\newcommand {\hVzsCorrel} {\ensuremath{(\text{h-V0})}}
\newcommand {\mPDG}[1] {\ensuremath{m_{\textsc{pdg}}(#1)}}
\newcommand {\Nevt} {\ensuremath{N_\text{evt}}}
\newcommand {\NevtINEL} {\ensuremath{N_\text{evt}(\textsc{inel})}}
\newcommand {\NevtNSD} {\ensuremath{N_\text{evt}(\textsc{nsd})}}
\newcommand {\INEL} {\ensuremath{\textsc{inel}}}
\newcommand {\INELZero} {\ensuremath{\textsc{inel}>0}}
\newcommand {\NSD} {\ensuremath{\textsc{nsd}}}
\newcommand {\dEdx} {\ensuremath{\textup{d}E/\textup{d}x }\xspace}
\newcommand {\bsTe} {\ensuremath{\bm{T_e}}}
\newcommand {\bsTb} {\ensuremath{\bm{T_b}}}
\newcommand {\bsTt} {\ensuremath{\bm{T_T}}}
\newcommand {\bsCt} {\ensuremath{\bm{C_T}}}
\newcommand {\bsNt} {\ensuremath{\bm{n}}}
\newcommand {\bsQt} {\ensuremath{\bm{q}}}
\newcommand {\bsVt} {\ensuremath{\bm{V}}}
\newcommand {\bsgVt} {\ensuremath{\bm{g.V}}}
\newcommand {\bsNb} {\ensuremath{\bm{n}}}
\newcommand {\bsFp} {\ensuremath{\bm{f_P}}}
\newcommand {\bsCp} {\ensuremath{\bm{C_P}}}
\newcommand {\Lint} {\ensuremath{L_{\text{int}}}}
\newcommand {\rphi} {\mbox{\ensuremath{(r,\varphi)}}}
\newcommand {\alphaS} {\mbox{$\alpha_{\textrm{s}}$}\xspace}
\newcommand{\LambdaQCD} {\mbox{$\Lambda_{\textrm{QCD}}$}\xspace}
\newcommand {\chLeptonAsymm}{\ensuremath{ A_{\ell\ell} }}
\newcommand {\MeanNpart} {\mbox{\ensuremath{\langle\kern-0.05em N_{part} \kern-0.05em \rangle}}}
\newcommand {\MeanNcoll} {\mbox{\ensuremath{\langle\kern-0.05em N_{coll} \kern-0.05em \rangle}}}
\newcommand {\sigmaBarlow} {\ensuremath{\sigma_{Barlow}}}
\newcommand {\sigmaStat} {\ensuremath{\sigma_{stat}}}
\newcommand {\sigmaSyst} {\ensuremath{\sigma_{syst}}}
\newcommand {\sigmaTot} {\ensuremath{\sqrt{\sigmaStat^2 + \sigmaSyst^2}}}
\newcommand{\rmChiSquare} {\ensuremath{\chi^2}\xspace}
\newcommand{\rmChiSquareNDF}{\ensuremath{\chi^2 / NDF}\xspace}
\newcommand{\rmNTracklet} {\ensuremath{N_{tracklets}}\xspace}
\newcommand {\xXzero} {\ensuremath{\textsc{x}/X_0}\xspace}
\newcommand {\Xzero} {\ensuremath{X_0}\xspace}
% 2.2 - unit vector for frame basis
\newcommand {\eX} {\ensuremath{\vec{e}_{\textsc{x}}}}
\newcommand {\eY} {\ensuremath{\vec{e}_{\textsc{y}}}}
\newcommand {\eZ} {\ensuremath{\vec{e}_{\textsc{z}}}}
\newcommand {\ePhi} {\ensuremath{\vec{e}_{\varphi}}}
\newcommand {\eR} {\ensuremath{\vec{e}_{r}}}
% 2.3 - some generator Names
\newcommand{\Sherpa} {\textsc{Sherpa}\xspace}
\newcommand{\Herwig} {\textsc{Herwig++}\xspace}
\newcommand{\Epos} {\textsc{Epos}\xspace}
\newcommand{\Pythia} {\textsc{Pythia}\xspace}
\newcommand{\Pythiaeight} {\Pythia~8\xspace}
\newcommand{\Hijing} {\textsc{Hijing}\xspace}
\newcommand{\Rivet} {\textsc{Rivet}\xspace}
\newcommand{\HepMC} {\textsc{HepMc}\xspace}
\newcommand{\GeantThree} {\textsc{Geant3}\xspace}
\newcommand{\GeantFour} {\textsc{Geant4}\xspace}
\newcommand{\Fluka} {\textsc{Fluka}\xspace}
%
% 3 - Collisions Systems
%
\newcommand {\pp} {\ensuremath{\mbox{\text {p\kern-0.05em p}}}\xspace}
\newcommand {\rmpp} {\ensuremath{\text{p\kern-0.05em p} }}
%\newcommand {\ppBoldMath} {\mbox{$\text{ \mathbf p\kern-0.05em \mathbf p }$}}
\newcommand {\ppbar} {\mbox{$\text{p}\overline{\text{p}}$}}
\newcommand {\PbPb} {\ensuremath{\mbox{\text{Pb--Pb}} }}
\newcommand {\rmPbPb} {\ensuremath{\text{PbPb} }}
\newcommand {\AuAu} {\ensuremath{\mbox{\text{Au--Au}} }}
\newcommand {\ArAr} {\ensuremath{\mbox{\text{Ar--Ar}} }}
\newcommand {\CuCu} {\ensuremath{\mbox{\text{Cu--Cu}} }}
\newcommand {\UU} {\ensuremath{\mbox{\text{U--U}} }}
\newcommand {\XeXe} {\ensuremath{\mbox{\text{Xe--Xe}} }}
\renewcommand {\AA} {\ensuremath{\text{A--A} }} % \AA in LaTeX is for the nordic char A with ° on top
\newcommand {\rmAA} {\ensuremath{\text{AA} }} % for compact super-/sub-script, need to remove mbox to allow font size to adapt
\newcommand {\pA} {\ensuremath{\mbox{\text{p--A}} }}
\newcommand {\rmpA} {\ensuremath{\text{pA} }} % for compact super-/sub-script, need to remove mbox to allow font size to adapt
\newcommand {\dA} {\ensuremath{\mbox{\text{d--A}} }}
\newcommand {\pPb} {\ensuremath{\mbox{\text{p--Pb}} }}
\newcommand {\Pbp} {\ensuremath{\mbox{\text{Pb--p}} }}
\newcommand {\dAu} {\ensuremath{\mbox{\text{d--Au}} }}
\newcommand {\pAu} {\ensuremath{\mbox{\text{p--Au}} }}
\newcommand {\EplusEminus} {\ee}
\newcommand {\ee} {\mbox{$\text{e}^+\text{e}^-$}}
\newcommand {\Eplus} {\mbox{$\text{e}^+$}}
\newcommand {\Eminus} {\mbox{$\text{e}^-$}}
\newcommand {\MuPlusMuMinus} {\mbox{$\mu^+\mu^-$}}
\newcommand {\MuPlus} {\mbox{$\mu^+$}}
\newcommand {\MuMinus} {\mbox{$\mu^-$}}
%
% 4 - some units
%
\newcommand {\massStyle}[1] {\mbox{\ensuremath{\text{#1}\kern-0.1em /\kern-0.12em c^2}}}
\newcommand {\mass} {\massStyle{MeV}\xspace}
\newcommand {\kmass} {\massStyle{keV}\xspace}
\newcommand {\mmass} {\massStyle{MeV}\xspace}
\newcommand {\gmass} {\massStyle{GeV}\xspace}
\newcommand {\unitStyle}[1] {\mbox{\ensuremath{\text{#1}}}}
\newcommand {\tev} {\unitStyle{TeV}\xspace}
\newcommand {\gev} {\unitStyle{GeV}\xspace}
\newcommand {\mev} {\unitStyle{MeV}\xspace}
\newcommand {\kev} {\unitStyle{keV}\xspace}
%\newcommand {\tevBoldMath} {\mbox{${\rm \mathbf{TeV}}$}}
%\newcommand {\gevBoldMath} {\mbox{${\rm \mathbf{GeV}}$}}
\newcommand {\momStyle}[1] {\mbox{\ensuremath{\text{#1}\kern-0.1em /\kern-0.12em c}}}
\newcommand {\mmom} {\momStyle{MeV}\xspace}
\newcommand {\gmom} {\momStyle{GeV}\xspace}
\newcommand {\fsec} {\unitStyle{fs}}
\newcommand {\psec} {\unitStyle{ps}\xspace}
\newcommand {\nsec} {\unitStyle{ns}\xspace}
\newcommand {\musec} {\mbox{$\mu\unitStyle{s}$}\xspace}
\newcommand {\millisec} {\unitStyle{ms}}
\newcommand {\second} {\unitStyle{s}\xspace}
\newcommand {\MHz} {\unitStyle{MHz}}
\newcommand {\kHz} {\unitStyle{kHz}}
\newcommand {\fmC} {\mbox{$\unitStyle{fm}/\kern-0.12em c$}\xspace}
\newcommand {\fm} {\unitStyle{fm}\xspace}
\newcommand {\nm} {\unitStyle{nm}\xspace}
\newcommand {\mum} {\mbox{$\mu\unitStyle{m}$}\xspace}
\newcommand {\mm} {\unitStyle{mm}\xspace}
\newcommand {\cm} {\unitStyle{cm}\xspace}
\newcommand {\m} {\unitStyle{m}\xspace}
\newcommand {\cmq} {\mbox{$\cm^2$}}
\newcommand {\mmq} {\mbox{$\mm^2$}}
\newcommand {\mumq} {\mbox{$\mum^2$}}
\newcommand {\fmCube} {\mbox{\unitStyle{fm}$^3$}}
\newcommand {\mug} {\mbox{$\mu\unitStyle{g}$}}
\newcommand {\mg} {\unitStyle{mg}}
\newcommand {\gram} {\unitStyle{g}}
\newcommand {\kg} {\unitStyle{kg}}
\newcommand {\dens} {\mbox{$\unitStyle{g}/\unitStyle{cm}^{3}$}}
\newcommand {\dg} {\mbox{$\kern+0.1em ^\circ$}}
\newcommand {\lumi} {\mbox{$\cm^{-2}\second^{-1}$}}
\newcommand {\barn} {\unitStyle{b}}
\newcommand {\fb} {\unitStyle{fb}}
\newcommand {\pb} {\unitStyle{pb}}
\newcommand {\nb} {\unitStyle{nb}}
\newcommand {\mub} {\mbox{$\mu\unitStyle{b}$}}
\newcommand {\mb} {\unitStyle{mb}}
\newcommand {\kb} {\unitStyle{kb}}
\newcommand {\invmub} {\mbox{$\mub^{-1}$}}
\newcommand {\invnb} {\mbox{$\nb^{-1}$}}
\newcommand {\invpb} {\mbox{$\pb^{-1}$}}
\newcommand {\invfb} {\mbox{$\fb^{-1}$}}
\newcommand {\invb} {\mbox{$\barn^{-1}$}}
\newcommand{\Lagr}{\mathcal{L}}
%
% 5 - some particles
%
% For particles, there one may always use romant font -> mathrm
\newcommand{\hPM} {\ensuremath{h^{\pm}}}
\newcommand{\ePlusMinus} {\mbox{$\mathrm {e^{\pm}}$}}
\newcommand{\electron} {\mbox{$\mathrm {e}$\xspace}}
\newcommand{\muPlusMinus} {\mbox{$\mathrm {\mu^{\pm}}$}}
\newcommand{\muon} {\mbox{$\mathrm {\mu}$}\xspace}
\newcommand{\etaZero} {\mbox{$\mathrm {\eta^0}$}}
\newcommand{\piZero} {\mbox{$\mathrm {\pi^0}$}}
\newcommand{\piMinus} {\mbox{$\mathrm {\pi^-}$}}
\newcommand{\piPlus} {\mbox{$\mathrm {\pi^+}$}}
\newcommand{\piPlusMinus} {\mbox{$\mathrm {\pi^{\pm}}$}}
\newcommand{\piMinusPlus} {\mbox{$\mathrm {\pi^{\mp}}$}}
\newcommand{\rmPiPlusMinus} {\piPlusMinus}
\newcommand{\rmPiPM} {\piPlusMinus}
\newcommand{\rmPiMP} {\piMinusPlus}
\newcommand{\rmPi} {\mbox{$\mathrm {\pi}$}\xspace}
\newcommand{\rhoZero} {\mbox{$\mathrm {\rho^0}$}}
\newcommand{\rhoMinus} {\mbox{$\mathrm {\rho^-}$}}
\newcommand{\rhoPlus} {\mbox{$\mathrm {\rho^+}$}}
\newcommand{\rmKaon} {\mbox{$\mathrm {K}$}\xspace}
\newcommand{\Kzs} {\mbox{$\mathrm {K^0_S}$}\xspace}
\newcommand{\rmKzero} {\Kzs}
\newcommand{\rmAKzero} {\ensuremath{\mathrm {\overline{K^0_S}}}}
\newcommand{\Kzl} {\mbox{$\mathrm {K^0_L}$}}
\newcommand{\rmKzeroL} {\Kzl}
\newcommand{\Kminus} {\mbox{$\mathrm {K^-}$}\xspace}
\newcommand{\rmKminus} {\Kminus}
\newcommand{\Kplus} {\mbox{$\mathrm {K^+}$}\xspace}
\newcommand{\rmKplus} {\Kplus}
\newcommand{\Kplusmin} {\mbox{$\mathrm {K^{\pm}}$}\xspace}
\newcommand{\Kminplus} {\mbox{$\mathrm {K^{\mp}}$}\xspace}
\newcommand{\rmKpm} {\Kplusmin}
%DIF 951c953
%DIF < \newcommand{\rmAKstarZero}{\mbox{$\overline{\mathrm{K}}^{*0}$}}
%DIF -------
\newcommand{\rmAKstarZero}{\mbox{$\overline{\mathrm{K}}^{*0}$}\xspace} %DIF >
%DIF -------
\newcommand{\rmKstarZero}{\mbox{$\mathrm{K}^{*0}$}}
\newcommand{\rmKstarPlus}{\mbox{$\mathrm{K}^{*+}$}}
\newcommand{\rmKstarMinus}{\mbox{$\mathrm{K}^{*-}$}}
\newcommand{\rmPhiMes} {\mbox{$\mathrm {\phi(1020)}$}\xspace}
\newcommand{\rmPhi} {\mbox{$\mathrm {\phi}$}\xspace}
\newcommand{\proton} {\mbox{$\mathrm {p}$}\xspace}
\newcommand{\pbar} {\mbox{$\mathrm {\overline{p}}$}}
% \newcommand{\pOrPbar} {\mbox{$\mathrm{\vcenter{\offinterlineskip \vskip-0.1ex\hbox{\tiny \kern-0.05em- \kern-0.3em-} \vskip+0.2ex\hbox{p}}^{\protect \tiny ^{\hdots} \kern-0.75em _{+} \kern-.7em}}$ }}
\newcommand{\pOrPbar} {\mbox{$\mathrm {p^{\pm}}$}}
\newcommand{\rmLambdaZ} {\mbox{$\mathrm {\Lambda}$}\xspace}
\newcommand{\rmAlambdaZ} {\mbox{$\mathrm {\overline{\Lambda}}$}\xspace}
\newcommand{\rmLambda} {\mbox{$\mathrm {\Lambda}$}\xspace}
\newcommand{\rmAlambda} {\mbox{$\mathrm {\overline{\Lambda}}$}\xspace}
\newcommand{\rmLambdas} {\mbox{$\mathrm {\Lambda \kern-0.2em + \kern-0.2em \overline{\Lambda}}$}\xspace}
\newcommand{\ratioLamOverKzs} {\rmLambda/\rmKzero\xspace}
\newcommand{\rmLambdaPM} {\mbox{$\mathrm {\dashover{\rmLambda}}$}\xspace}
\newcommand{\rmSigma} {\mbox{$\mathrm {\Sigma}$}\xspace}
\newcommand{\rmSigmaM} {\mbox{$\mathrm{\Sigma}^{-}$}\xspace}
\newcommand{\rmSigmaP} {\mbox{$\mathrm{\Sigma}^{+}$}\xspace}
\newcommand{\rmSigmaZero} {\mbox{$\mathrm{\Sigma}^{0}$}\xspace}
\newcommand{\rmSigmaMres} {\mbox{$\mathrm{\Sigma(1385)}^{-}$}\xspace}
\newcommand{\rmSigmaPres} {\mbox{$\mathrm{\Sigma(1385)}^{+}$}\xspace}
\newcommand{\rmXi} {\mbox{$\mathrm{\Xi}$}\xspace}
\newcommand{\rmXiM} {\mbox{$\mathrm{\Xi}^{-}$}\xspace}
\newcommand{\rmAxiP} {\mbox{$\mathrm {\overline{\Xi}^{+}}$}\xspace}
\newcommand{\rmXiPM} {\mbox{$\dashover{\rmXi}^{\pm}$}\xspace}
% \newcommand{\rmXiPM} { \mbox{$\kern-0.1em \mathrm{\vcenter{\offinterlineskip \vskip-1.0ex\hbox{\tiny \kern-0.05em- \kern-0.3em- \kern-0.3em-} \vskip+0.01ex\hbox{$\Xi$}}^{\protect \underline{\fivedots}}} \kern-0.1em$} }
% \newcommand{\rmXiPM} { \mbox{$\kern-0.0em \mathrm{\vcenter{\offinterlineskip \vskip-1.0ex\hbox{\tiny \kern+0.05em- \kern-0.3em- \kern-0.3em-} \vskip+0.1ex\hbox{$\Xi$}}^{\protect \tiny ^\fivedots \kern-0.75em _{\relbar} \kern-.3em}}$} }
% \newcommand{\rmXiPM} {\mbox{$\kern-0.1em \mathrm{ \protect \overset{ {\tiny \kern-0.09em- \kern-0.3em- \kern-0.3em-} }{\Xi}^{\protect \tiny ^\fivedots \kern-0.3em / \kern-0.2em _- \kern-0.25em}}$}}