Skip to content

Commit 4221b5e

Browse files
committed
feat(los):Add a second parameter for Z calibrations
General update Clang-format Delete old classes Clang-format
1 parent 5e651a4 commit 4221b5e

163 files changed

Lines changed: 358 additions & 43396 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.clang-format

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Language: Cpp
44
ConstructorInitializerIndentWidth: 4
55
AlignEscapedNewlinesLeft: true
66
AlignTrailingComments: true
7+
AlignAfterOpenBracket: Align
78
AllowAllParametersOfDeclarationOnNextLine: false
89
AllowShortIfStatementsOnASingleLine: false
910
AllowShortLoopsOnASingleLine: false
@@ -51,4 +52,5 @@ SpaceBeforeAssignmentOperators: true
5152
ContinuationIndentWidth: 4
5253
CommentPragmas: '^ IWYU pragma:'
5354
SpaceBeforeParens: ControlStatements
55+
SpaceBeforeCpp11BracedList: false
5456
...

CMakeLists.txt

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ project(R3BROOT LANGUAGES C CXX Fortran)
3232
# use default gnu install convention:
3333
include(GNUInstallDirs)
3434

35+
option(BUILD_LAND_DIR "Build old land module" ON)
36+
3537
# Check for needed environment variables
3638
if(NOT DEFINED ENV{SIMPATH})
3739
message(
@@ -555,28 +557,23 @@ if(NOT MODULE)
555557
endif()
556558
add_subdirectory(neuland)
557559
add_subdirectory(glad)
558-
add_subdirectory(dch)
559560
add_subdirectory(fiber)
560-
add_subdirectory(gfi)
561-
add_subdirectory(land)
561+
if(BUILD_LAND_DIR)
562+
add_subdirectory(land)
563+
endif()
562564
add_subdirectory(los)
563565
add_subdirectory(rolu)
564566
add_subdirectory(frssci)
565567
add_subdirectory(sci2)
566568
add_subdirectory(sci8)
567-
add_subdirectory(sfib)
568-
add_subdirectory(mtof)
569569
add_subdirectory(tofi)
570570
add_subdirectory(tofd)
571571
add_subdirectory(ssd)
572572
add_subdirectory(tttx)
573-
add_subdirectory(strawtubes)
574573
add_subdirectory(music)
575574
add_subdirectory(r3bgen)
576575
add_subdirectory(califa)
577576
add_subdirectory(evtvis)
578-
add_subdirectory(compilehelper)
579-
add_subdirectory(tracker_rene)
580577
add_subdirectory(psp)
581578
add_subdirectory(rpc)
582579
add_subdirectory(alpide)

analysis/AnaLinkDef.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,14 @@
1919
#pragma link off all classes;
2020
#pragma link off all functions;
2121

22-
#pragma link C++ class R3BAnalysisIncomingFrs+;
2322
#pragma link C++ class R3BAnalysisIncomingID+;
2423
#pragma link C++ class R3BIncomingBeta+;
2524
#pragma link C++ class R3BIncomingIDPar+;
2625
#pragma link C++ class R3BAnalysisContFact+;
27-
#pragma link C++ class R3BGlobalAnalysis+;
28-
#pragma link C++ class R3BGlobalAnalysisS454+;
29-
#pragma link C++ class R3BTrackS454+;
30-
#pragma link C++ class R3BTrackerTestS454+;
3126

32-
#pragma link C++ class R3BOnlineSpectra+;
33-
#pragma link C++ class R3BOnlineSpectraDec2019+;
3427
#pragma link C++ class R3BOnlineSpectraPdc+;
35-
#pragma link C++ class R3BOnlineSpectraSfib+;
3628
#pragma link C++ class R3BOnlineSpillAnalysis+;
3729
#pragma link C++ class R3BOnlineSpectraLosVsSci2+;
38-
#pragma link C++ class R3BOnlineSpectraFibvsToFDS494+;
39-
#pragma link C++ class R3BOnlineSpectraBMON_S494+;
40-
#pragma link C++ class R3BOnlineSpectraFiber23+;
41-
#pragma link C++ class R3BOnlineSpectraToFI_S494+;
4230
#pragma link C++ class R3BTwimvsFootOnlineSpectra+;
4331
#pragma link C++ class R3BIncomingTrackingOnlineSpectra+;
4432
#pragma link C++ class R3BIncomingTrackingFootOnlineSpectra+;
@@ -51,7 +39,6 @@
5139
#pragma link C++ class R3BFibervsTofDOnlineSpectra+;
5240
#pragma link C++ class R3BFiberTrackingOnlineSpectra+;
5341
#pragma link C++ class R3BFootVsAlpideOnlineSpectra+;
54-
#pragma link C++ class R3BGeneralOnlineSpectra+;
5542
#pragma link C++ class R3BIncomingIDOnlineSpectra+;
5643
#pragma link C++ class R3BTofDvsTttxOnlineSpectra+;
5744
#pragma link C++ class R3BOnlineSyncCheck+;

analysis/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ add_library_with_dictionary(
3535
online
3636
pars
3737
DEPENDENCIES
38-
R3BTraRene
3938
R3BLos
4039
R3BCalifa
4140
R3BMwpc

0 commit comments

Comments
 (0)