diff --git a/analysis/PWGDIL/dielectron/conversion/CMakeLists.txt b/analysis/PWGDIL/dielectron/conversion/CMakeLists.txt
index f6efb53ed7d129192a4d7cc910404a3c79959fc5..bd1bf7a50a37908629f85ea57ef967162b5da251 100644
--- a/analysis/PWGDIL/dielectron/conversion/CMakeLists.txt
+++ b/analysis/PWGDIL/dielectron/conversion/CMakeLists.txt
@@ -1,10 +1,6 @@
Set(INCLUDE_DIRECTORIES
${CMAKE_CURRENT_SOURCE_DIR}
-${CBMROOT_SOURCE_DIR}/analysis/PWGDIL/dielectron/lmvm
-
-${CBMROOT_SOURCE_DIR}/reco/base
-#${CBMBASE_DIR}
${CBMBASE_DIR}/draw
${CBMBASE_DIR}/utils
@@ -13,6 +9,11 @@ ${CBMDATA_DIR}/sts
${CBMDATA_DIR}/global
${CBMDATA_DIR}/rich
+${CBMROOT_SOURCE_DIR}/core/detectors/rich/utils
+${CBMROOT_SOURCE_DIR}/core/detectors/rich
+
+${CBMROOT_SOURCE_DIR}/reco/base
+
${CBMROOT_SOURCE_DIR}/reco/KF
${CBMROOT_SOURCE_DIR}/reco/KF/Interface
@@ -22,8 +23,7 @@ ${CBMROOT_SOURCE_DIR}/reco/L1/ParticleFinder
${CBMROOT_SOURCE_DIR}/reco/littrack/cbm/elid
-${CBMROOT_SOURCE_DIR}/reco/detectors/rich
-${CBMROOT_SOURCE_DIR}/reco/detectors/rich/utils
+${CBMROOT_SOURCE_DIR}/analysis/PWGDIL/dielectron/lmvm
)
Include_Directories( ${INCLUDE_DIRECTORIES})
diff --git a/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt b/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt
index 129de37c203bcb1a61ec65662c18963bed83aa9f..8d0f0d241fef901a0e21639ae2e48515bede6e0b 100644
--- a/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt
+++ b/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt
@@ -1,10 +1,6 @@
Set(INCLUDE_DIRECTORIES
-
-#${CBMROOT_SOURCE_DIR}/analysis
${CMAKE_CURRENT_SOURCE_DIR}
-${CBMROOT_SOURCE_DIR}/sim/transport/generators/unigen
-
${CBMBASE_DIR}
${CBMBASE_DIR}/draw
${CBMBASE_DIR}/report
@@ -21,10 +17,9 @@ ${CBMDATA_DIR}/tof
${CBMDATA_DIR}/psd
${CBMROOT_SOURCE_DIR}/mvd
-#${CBMROOT_SOURCE_DIR}/sts
-${CBMROOT_SOURCE_DIR}/reco/detectors/rich
+${CBMROOT_SOURCE_DIR}/core/detectors/rich
-${CBMROOT_SOURCE_DIR}/run
+${CBMROOT_SOURCE_DIR}/sim/transport/generators/unigen
${CBMROOT_SOURCE_DIR}/reco/KF
${CBMROOT_SOURCE_DIR}/reco/KF/Interface
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CMakeLists.txt b/analysis/PWGDIL/dielectron/pi0eta/CMakeLists.txt
index 33cf2f1406026b5488871e9becb5de533c396e19..48fcb315e485898c4dbc2592a9e8eb790122bfd4 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CMakeLists.txt
+++ b/analysis/PWGDIL/dielectron/pi0eta/CMakeLists.txt
@@ -1,10 +1,6 @@
Set(INCLUDE_DIRECTORIES
${CMAKE_CURRENT_SOURCE_DIR}
-${CBMROOT_SOURCE_DIR}/analysis/PWGDIL/dielectron/lmvm
-
-${CBMROOT_SOURCE_DIR}/reco/base
-
${CBMBASE_DIR}/draw
${CBMBASE_DIR}/utils
@@ -14,6 +10,8 @@ ${CBMDATA_DIR}/sts
${CBMDATA_DIR}/global
${CBMDATA_DIR}/rich
+${CBMROOT_SOURCE_DIR}/reco/base
+
${CBMROOT_SOURCE_DIR}/reco/KF
${CBMROOT_SOURCE_DIR}/reco/KF/Interface
@@ -21,11 +19,14 @@ ${CBMROOT_SOURCE_DIR}/reco/L1
${CBMROOT_SOURCE_DIR}/reco/L1/L1Algo
${CBMROOT_SOURCE_DIR}/reco/L1/ParticleFinder
-${CBMROOT_SOURCE_DIR}/littrack/cbm/elid
+#${CBMROOT_SOURCE_DIR}/littrack/cbm/elid
-${CBMROOT_SOURCE_DIR}/rich
+#${CBMROOT_SOURCE_DIR}/rich
${CBMROOT_SOURCE_DIR}/reco/detectors/rich/fitter
-${CBMROOT_SOURCE_DIR}/reco/detectors/rich/utils
+${CBMROOT_SOURCE_DIR}/core/detectors/rich/utils
+
+${CBMROOT_SOURCE_DIR}/analysis/PWGDIL/dielectron/lmvm
+
)
Include_Directories( ${INCLUDE_DIRECTORIES})
diff --git a/core/detectors/rich/CMakeLists.txt b/core/detectors/rich/CMakeLists.txt
index 124f1fe9966f037a92be10ff5a4c9c4d73f48160..77c01f1eb04a514fb7a31cb43ae97d03b731ecd9 100644
--- a/core/detectors/rich/CMakeLists.txt
+++ b/core/detectors/rich/CMakeLists.txt
@@ -1,8 +1,10 @@
set(INCLUDE_DIRECTORIES
${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/utils
${CBMDATA_DIR}
${CBMDATA_DIR}/rich
+ ${CBMDATA_DIR}/global
${CBMBASE_DIR}
${CBMBASE_DIR}/draw
@@ -33,6 +35,7 @@ set(SRCS
)
set(NO_DICT_SRCS
+ CbmRichElectronIdAnn.cxx
CbmRichGeoManager.cxx
CbmRichDigiMapManager.cxx
CbmRichMCbmDigiMapManager.cxx
diff --git a/reco/detectors/rich/CbmRichElectronIdAnn.cxx b/core/detectors/rich/CbmRichElectronIdAnn.cxx
similarity index 100%
rename from reco/detectors/rich/CbmRichElectronIdAnn.cxx
rename to core/detectors/rich/CbmRichElectronIdAnn.cxx
diff --git a/reco/detectors/rich/CbmRichElectronIdAnn.h b/core/detectors/rich/CbmRichElectronIdAnn.h
similarity index 100%
rename from reco/detectors/rich/CbmRichElectronIdAnn.h
rename to core/detectors/rich/CbmRichElectronIdAnn.h
diff --git a/reco/detectors/rich/utils/CbmRichNavigationUtil.h b/core/detectors/rich/utils/CbmRichNavigationUtil.h
similarity index 100%
rename from reco/detectors/rich/utils/CbmRichNavigationUtil.h
rename to core/detectors/rich/utils/CbmRichNavigationUtil.h
diff --git a/reco/detectors/rich/utils/CbmRichUtil.h b/core/detectors/rich/utils/CbmRichUtil.h
similarity index 100%
rename from reco/detectors/rich/utils/CbmRichUtil.h
rename to core/detectors/rich/utils/CbmRichUtil.h
diff --git a/reco/detectors/rich/utils/hadd.C b/core/detectors/rich/utils/hadd.C
similarity index 100%
rename from reco/detectors/rich/utils/hadd.C
rename to core/detectors/rich/utils/hadd.C
diff --git a/reco/detectors/rich/CMakeLists.txt b/reco/detectors/rich/CMakeLists.txt
index 16bdb2b2153c2131d23a4fc71977bfc280f364fe..ac165009c0c459467cebc99fba8a0ded979ac488 100644
--- a/reco/detectors/rich/CMakeLists.txt
+++ b/reco/detectors/rich/CMakeLists.txt
@@ -6,16 +6,11 @@ ${CMAKE_CURRENT_SOURCE_DIR}/finder
${CMAKE_CURRENT_SOURCE_DIR}/fitter
${CMAKE_CURRENT_SOURCE_DIR}/tracks
${CMAKE_CURRENT_SOURCE_DIR}/selection
-${CMAKE_CURRENT_SOURCE_DIR}/utils
${CMAKE_CURRENT_SOURCE_DIR}/qa
${CMAKE_CURRENT_SOURCE_DIR}/alignment
${CMAKE_CURRENT_SOURCE_DIR}/mcbm
${CMAKE_CURRENT_SOURCE_DIR}/unpack
-${CBMROOT_SOURCE_DIR}/core/detectors/rich
-
-${CBMROOT_SOURCE_DIR}/reco/base
-
${CBMBASE_DIR}
${CBMBASE_DIR}/report
${CBMBASE_DIR}/draw
@@ -29,6 +24,11 @@ ${CBMDATA_DIR}/tof
${CBMDATA_DIR}/sts
${CBMDATA_DIR}/global
+${CBMROOT_SOURCE_DIR}/core/detectors/rich
+${CBMROOT_SOURCE_DIR}/core/detectors/rich/utils
+
+${CBMROOT_SOURCE_DIR}/reco/base
+
${CBMROOT_SOURCE_DIR}/reco/littrack
${CBMROOT_SOURCE_DIR}/reco/littrack/std
${CBMROOT_SOURCE_DIR}/reco/littrack/std/base
@@ -39,8 +39,6 @@ ${CBMROOT_SOURCE_DIR}/reco/KF
${CBMROOT_SOURCE_DIR}/reco/KF/Interface
${CBMROOT_SOURCE_DIR}/reco/L1/OffLineInterface
-
-${CBMROOT_SOURCE_DIR}/run
)
Include_Directories( ${INCLUDE_DIRECTORIES})
@@ -89,7 +87,6 @@ unpack/CbmRichUnpackConfig.cxx
)
set(NO_DICT_SRCS
-CbmRichElectronIdAnn.cxx
CbmRichConverter.cxx
finder/CbmRichRingFinderIdeal.cxx
finder/CbmRichRingFinderHoughImpl.cxx
diff --git a/reco/detectors/rich/alignment/CbmRichUtil.h b/reco/detectors/rich/alignment/CbmRichUtil.h
deleted file mode 100644
index aeadfd2d124eba6a940fdc6c6b39fae16ff977ec..0000000000000000000000000000000000000000
--- a/reco/detectors/rich/alignment/CbmRichUtil.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* Copyright (C) 2019 Justus-Liebig-Universitaet Giessen, Giessen
- SPDX-License-Identifier: GPL-3.0-only
- Authors: Jordan Bendarouach [committer] */
-
-#ifndef RICH_CbmRichUtil
-#define RICH_CbmRichUtil
-
-#include "CbmGlobalTrack.h"
-
-#include "FairRootManager.h"
-#include "FairTrackParam.h"
-#include <Logger.h>
-
-#include "TCanvas.h"
-#include "TClonesArray.h"
-#include "TH2.h"
-#include "TObject.h"
-
-#include <string>
-
-using namespace std;
-
-class CbmRichUtil {
-
-public:
- static Double_t GetRingTrackDistance(Int_t globalTrackId)
- {
- vector<Double_t> v = GetRingTrackDistanceImpl(globalTrackId);
- return v[0];
- }
-
- static Double_t GetRingTrackDistanceX(Int_t globalTrackId)
- {
- vector<Double_t> v = GetRingTrackDistanceImpl(globalTrackId);
- return v[1];
- }
-
- static Double_t GetRingTrackDistanceY(Int_t globalTrackId)
- {
- vector<Double_t> v = GetRingTrackDistanceImpl(globalTrackId);
- return v[2];
- }
-
-private:
- /**
- * \brief Return a vector with total distance and x, y components. [0] - total distance, [1] - x component, [2] - y component
- */
- static vector<Double_t> GetRingTrackDistanceImpl(Int_t globalTrackId)
- {
- vector<Double_t> errorVec = {999., 999., 999.};
- FairRootManager* ioman = FairRootManager::Instance();
- if (ioman == NULL) return errorVec;
- // Do we really need static here, depends on ioman->GetObject() method
- static TClonesArray* globalTracks = NULL;
- static TClonesArray* richRings = NULL;
- static TClonesArray* richProjections = NULL;
-
- if (globalTracks == NULL || richRings == NULL || richProjections == NULL) {
- //cout << "globalTracks == NULL || richRings == NULL || richProjections == NULL" << endl;
- globalTracks = (TClonesArray*) ioman->GetObject("GlobalTrack");
- richRings = (TClonesArray*) ioman->GetObject("RichRing");
- richProjections = (TClonesArray*) ioman->GetObject("RichProjection");
- }
- else {
- //cout << "globalTracks, richRings, richProjections NOT NULL" << endl;
- }
-
- if (globalTracks == NULL || richRings == NULL || richProjections == NULL) {
- LOG(error) << "CbmRichUtil::GetRingTrackDistance globalTracks, "
- "richRings, richProjections NOT INITIALIZED"
- << endl;
- return errorVec;
- }
-
- const CbmGlobalTrack* globalTrack = static_cast<const CbmGlobalTrack*>(globalTracks->At(globalTrackId));
- if (globalTrack == NULL) return errorVec;
-
- Int_t stsId = globalTrack->GetStsTrackIndex();
- if (stsId < 0) return errorVec;
-
- const FairTrackParam* pTrack = static_cast<const FairTrackParam*>(richProjections->At(stsId));
- if (pTrack == NULL) return errorVec;
-
- if (pTrack->GetX() == 0 && pTrack->GetY() == 0) return errorVec;
-
- Int_t richId = globalTrack->GetRichRingIndex();
- if (richId < 0) return errorVec;
-
- const CbmRichRing* richRing = static_cast<const CbmRichRing*>(richRings->At(richId));
- if (richRing == NULL) return errorVec;
-
- Double_t xRing = richRing->GetCenterX();
- Double_t yRing = richRing->GetCenterY();
- Double_t dx = richRing->GetCenterX() - pTrack->GetX();
- Double_t dy = richRing->GetCenterY() - pTrack->GetY();
-
- Double_t dist = TMath::Sqrt(dx * dx + dy * dy);
-
- vector<Double_t> v = {dist, dx, dy};
- }
-};
-
-#endif
diff --git a/reco/littrack/CMakeLists.txt b/reco/littrack/CMakeLists.txt
index 18e945027ebe8efc4317eb5abbae5ea769b550d5..5b2a090a58fc551979ed9b22535c5d438d6aacfc 100644
--- a/reco/littrack/CMakeLists.txt
+++ b/reco/littrack/CMakeLists.txt
@@ -23,9 +23,10 @@ ${CMAKE_CURRENT_SOURCE_DIR}/cbm/qa/radlength
${CMAKE_CURRENT_SOURCE_DIR}/cbm/qa/tof
${CBMROOT_SOURCE_DIR}/reco/base
+
+# needed only for the LitrackQA library
${CBMROOT_SOURCE_DIR}/reco/detectors/rich
${CBMROOT_SOURCE_DIR}/reco/detectors/rich/fitter
-${CBMROOT_SOURCE_DIR}/reco/detectors/rich/utils
${CBMBASE_DIR}
${CBMBASE_DIR}/report
@@ -44,9 +45,8 @@ ${CBMDATA_DIR}/rich
${CBMDETECTORBASE_DIR}/much
${CBMDETECTORBASE_DIR}/sts
-
-
${CBMDETECTORBASE_DIR}/rich
+${CBMDETECTORBASE_DIR}/rich/utils
${CBMROOT_SOURCE_DIR}/reco/KF
${CBMROOT_SOURCE_DIR}/reco/KF/Interface
@@ -75,23 +75,17 @@ link_directories( ${LINK_DIRECTORIES})
set(SRCS
cbm/base/CbmLitDetectorSetup.cxx
-
+
cbm/elid/CbmLitGlobalElectronId.cxx
-
+
cbm/reco/CbmLitFindMvdTracks.cxx
cbm/reco/CbmLitFitTracksParallel.cxx
cbm/reco/CbmLitFitTracks.cxx
-
+
cbm/generators/CbmLitPolarizedGenerator.cxx
-
- cbm/qa/base/CbmLitResultChecker.cxx
- cbm/qa/material/CbmLitCheckEnergyLossMuons.cxx
- cbm/qa/material/CbmLitCheckBrem.cxx
- cbm/qa/mc/CbmLitMCTrack.cxx
- cbm/qa/mc/CbmLitMCTrackCreator.cxx
- cbm/qa/CbmLitCreateStandaloneData.cxx
- cbm/qa/CbmLitTestMatrixMath.cxx
+
${LITTRACKSTD_SRCS}
+
cbm/base/CbmLitFieldGridCreator.cxx
cbm/base/CbmLitFieldFitter.cxx
cbm/base/CbmLitToolFactory.cxx
@@ -100,8 +94,18 @@ set(SRCS
cbm/reco/CbmLitFindGlobalTracksIdeal.cxx
cbm/reco/CbmLitFindGlobalTracksParallel.cxx
cbm/utils/CbmLitConverterParallel.cxx
+)
+
+set(QA_SRCS
+ cbm/qa/base/CbmLitResultChecker.cxx
+ cbm/qa/material/CbmLitCheckEnergyLossMuons.cxx
+ cbm/qa/material/CbmLitCheckBrem.cxx
+ cbm/qa/mc/CbmLitMCTrack.cxx
+ cbm/qa/mc/CbmLitMCTrackCreator.cxx
+ cbm/qa/CbmLitCreateStandaloneData.cxx
+ cbm/qa/CbmLitTestMatrixMath.cxx
cbm/qa/tracking/CbmLitTrackingQa.cxx
- cbm/qa/tracking/CbmLitTrackingQaStudyReport.cxx
+ cbm/qa/tracking/CbmLitTrackingQaStudyReport.cxx
cbm/qa/tracking/CbmLitTrackingQaReport.cxx
cbm/qa/clustering/CbmLitClusteringQa.cxx
cbm/qa/clustering/CbmLitClusteringQaReport.cxx
@@ -129,8 +133,11 @@ set(HEADERS
cbm/reco/CbmLitFitTracks.h
cbm/reco/CbmLitFindGlobalTracksParallel.h
cbm/generators/CbmLitPolarizedGenerator.h
- cbm/qa/material/CbmLitCheckEnergyLossMuons.h
- cbm/qa/material/CbmLitCheckBrem.h
+)
+
+Set(QA_HEADERS
+ cbm/qa/material/CbmLitCheckEnergyLossMuons.h
+ cbm/qa/material/CbmLitCheckBrem.h
cbm/qa/CbmLitCreateStandaloneData.h
cbm/qa/CbmLitTestMatrixMath.h
cbm/qa/tracking/CbmLitTrackingQa.h
@@ -139,7 +146,7 @@ set(HEADERS
cbm/qa/clustering/CbmLitClusteringQa.h
cbm/qa/clustering/CbmLitClusteringQaReport.h
cbm/qa/clustering/CbmLitClusteringQaStudyReport.h
- cbm/qa/fit/CbmLitFitQa.h
+ cbm/qa/fit/CbmLitFitQa.h
cbm/qa/fit/CbmLitFitQaReport.h
cbm/qa/fit/CbmLitFitQaStudyReport.h
cbm/qa/field/CbmLitFieldQa.h
@@ -174,7 +181,17 @@ EndIf (Boost_FOUND)
set(LINKDEF LittrackLinkDef.h)
Set(LIBRARY_NAME Littrack)
Set(DEPENDENCIES
- Littrackparallel KF CbmMuchBase CbmStsBase CbmRichReco CbmRichBase CbmRecoBase CbmBase CbmData Base
+ Littrackparallel KF CbmMuchBase CbmStsBase CbmRichBase CbmRecoBase CbmBase CbmData Base
+)
+GENERATE_LIBRARY()
+
+
+set(SRCS ${QA_SRCS})
+set(HEADERS ${QA_HEADERS})
+set(LINKDEF LittrackQALinkDef.h)
+Set(LIBRARY_NAME LittrackQA)
+Set(DEPENDENCIES
+ Littrack
)
GENERATE_LIBRARY()
diff --git a/reco/littrack/LittrackLinkDef.h b/reco/littrack/LittrackLinkDef.h
index a20432661314d8bf2e4a323d5947b02c71945d50..d20fc20881b84f3b6d9bb1738e32e6d5905690df 100644
--- a/reco/littrack/LittrackLinkDef.h
+++ b/reco/littrack/LittrackLinkDef.h
@@ -18,30 +18,6 @@
#pragma link C++ class CbmLitFindMvdTracks + ;
#pragma link C++ class CbmLitFindGlobalTracksIdeal + ;
-#pragma link C++ class CbmLitTrackingQa + ;
-#pragma link C++ class CbmLitClusteringQa + ;
-#pragma link C++ class CbmLitFieldQa + ;
-#pragma link C++ class CbmLitFieldApproximationQa + ;
-#pragma link C++ class CbmLitFitQa + ;
-#pragma link C++ class CbmLitRadLengthQa + ;
-#pragma link C++ class CbmLitTofQa + ;
-
-#pragma link C++ class CbmLitCheckEnergyLossMuons + ;
-#pragma link C++ class CbmLitCheckBrem + ;
-#pragma link C++ class CbmLitCreateStandaloneData + ;
-#pragma link C++ class CbmLitTestMatrixMath + ;
#pragma link C++ class CbmLitFitTracksParallel + ;
-#pragma link C++ class CbmLitTrackingQaReport + ;
-#pragma link C++ class CbmLitTrackingQaStudyReport + ;
-#pragma link C++ class CbmLitClusteringQaReport + ;
-#pragma link C++ class CbmLitClusteringQaStudyReport + ;
-#pragma link C++ class CbmLitFitQaReport + ;
-#pragma link C++ class CbmLitFieldQaReport + ;
-#pragma link C++ class CbmLitFitQaStudyReport + ;
-#pragma link C++ class CbmLitFieldApproximationQaReport + ;
-#pragma link C++ class CbmLitRadLengthQaReport + ;
-#pragma link C++ class CbmLitTofQaReport + ;
-#pragma link C++ class CbmLitRadLengthGenerator + ;
-
#endif
diff --git a/reco/littrack/LittrackQALinkDef.h b/reco/littrack/LittrackQALinkDef.h
new file mode 100644
index 0000000000000000000000000000000000000000..5356002c73cb4901e00705fc949ee6afba55a402
--- /dev/null
+++ b/reco/littrack/LittrackQALinkDef.h
@@ -0,0 +1,31 @@
+/* Copyright (C) 2006-2013 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+ SPDX-License-Identifier: GPL-3.0-only
+ Authors: Andrey Lebedev, Mohammad Al-Turany [committer] */
+
+#ifdef __CINT__
+
+#pragma link C++ class CbmLitTrackingQa + ;
+#pragma link C++ class CbmLitClusteringQa + ;
+#pragma link C++ class CbmLitFieldQa + ;
+#pragma link C++ class CbmLitFieldApproximationQa + ;
+#pragma link C++ class CbmLitFitQa + ;
+#pragma link C++ class CbmLitRadLengthQa + ;
+#pragma link C++ class CbmLitTofQa + ;
+
+#pragma link C++ class CbmLitCheckEnergyLossMuons + ;
+#pragma link C++ class CbmLitCheckBrem + ;
+#pragma link C++ class CbmLitCreateStandaloneData + ;
+#pragma link C++ class CbmLitTestMatrixMath + ;
+
+#pragma link C++ class CbmLitTrackingQaReport + ;
+#pragma link C++ class CbmLitTrackingQaStudyReport + ;
+#pragma link C++ class CbmLitClusteringQaReport + ;
+#pragma link C++ class CbmLitClusteringQaStudyReport + ;
+#pragma link C++ class CbmLitFitQaReport + ;
+#pragma link C++ class CbmLitFieldQaReport + ;
+#pragma link C++ class CbmLitFitQaStudyReport + ;
+#pragma link C++ class CbmLitFieldApproximationQaReport + ;
+#pragma link C++ class CbmLitRadLengthQaReport + ;
+#pragma link C++ class CbmLitTofQaReport + ;
+#pragma link C++ class CbmLitRadLengthGenerator + ;
+#endif