Move rich local reconstruction code

There were rich ring finders in the L1 code base which were compiled and linked
into libL1. With the change in the build system this results in a circular
dependency between the L1 and CbmRichReco libraries which was resolved by
removing the classes from compilation.
With this commit the classes are moved from the L1 code base into the rich
reconstruction code base.

reco/L1/CMakeLists.txt

@@ -32,8 +32,6 @@ set(SRCS
   CbmL1TrackMerger.cxx 
   CbmL1TofMerger.cxx
  # L1AlgoInputData.cxx
-  #OffLineInterface/CbmL1RichENNRingFinder.cxx
-  #OffLineInterface/CbmL1RichENNRingFinderParallel.cxx 
   OffLineInterface/CbmL1StsTrackFinder.cxx 
   OffLineInterface/CbmL1GlobalTrackFinder.cxx 
   OffLineInterface/CbmL1GlobalFindTracksEvents.cxx
@@ -41,7 +39,6 @@ set(SRCS
   #OffLineInterface / CbmL1MuchHit.cxx
   #OffLineInterface / CbmL1MuchTrack.cxx
   #OffLineInterface / CbmL1MuchFinderQa.cxx
-  #OffLineInterface/CbmL1RichRingQa.cxx
   #OffLineInterface / CbmL1SttHit.cxx
   #OffLineInterface / CbmL1SttTrackFinder.cxx
   #OffLineInterface / CbmL1SttTrack.cxx 

reco/L1/L1LinkDef.h

@@ -11,7 +11,6 @@
 #pragma link off all functions;
 
 #pragma link C++ class CbmL1 + ;
-//#pragma link C++ class CbmL1RichENNRingFinder + ;
 #pragma link C++ class CbmL1StsTrackFinder + ;
 //#pragma link C++ class  CbmL1TrdTrackFinderSts+;
 #pragma link C++ class CbmL1TrackMerger + ;
@@ -20,7 +19,6 @@
 //#pragma link C++ class  CbmL1MuchHit+;
 //#pragma link C++ class  CbmL1MuchTrack+;
 //#pragma link C++ class  CbmL1MuchFinderQa+;
-//#pragma link C++ class CbmL1RichRingQa + ;
 #pragma link C++ class CbmL1TrdTracklet + ;
 #pragma link C++ class CbmL1TrdTracklet4 + ;
 #pragma link C++ class CbmL1GlobalTrackFinder + ;

reco/detectors/rich/CMakeLists.txt

@@ -33,6 +33,7 @@ set(SRCS
   qa/CbmRichUrqmdTest.cxx
   qa/CbmRichGeoTestOpt.cxx
   qa/CbmRichRecoQa.cxx
+  qa/CbmL1RichRingQa.cxx
 
   unpack/CbmRichUnpackAlgo.cxx
   unpack/CbmRichUnpackAlgo2022.cxx
@@ -43,9 +44,12 @@ set(SRCS
 
 set(NO_DICT_SRCS
   CbmRichConverter.cxx
+
   finder/CbmRichRingFinderIdeal.cxx
   finder/CbmRichRingFinderHoughImpl.cxx
   finder/CbmRichRingFinderHough.cxx
+  finder/CbmL1RichENNRingFinder.cxx
+  finder/CbmL1RichENNRingFinderParallel.cxx 
 
   fitter/CbmRichRingFitterCircle.cxx
   fitter/CbmRichRingFitterCOP.cxx

reco/detectors/rich/CbmRichRecoLinkDef.h

@@ -31,6 +31,7 @@
 #pragma link C++ class CbmRichRingFitterQa + ;
 #pragma link C++ class CbmRichRecoQa + ;
 #pragma link C++ class CbmRichRecoTbQa + ;
+#pragma link C++ class CbmL1RichRingQa + ;
 
 //unpack
 #pragma link C++ class CbmRichUnpackAlgo + ;

reco/detectors/rich/CbmRichReconstruction.cxx

@@ -16,7 +16,8 @@
 #include "CbmRichRing.h"
 //#include "prototype/CbmRichProtProjectionProducer.h"
 
-//#include "CbmL1RichENNRingFinder.h"
+#include "CbmL1RichENNRingFinder.h"
+#include "CbmL1RichENNRingFinderParallel.h"
 #include "CbmRichRingFinderHough.h"
 #include "CbmRichRingFinderIdeal.h"
 #include "CbmRichTrackExtrapolationBase.h"
@@ -24,7 +25,6 @@
 #include "CbmRichTrackExtrapolationKF.h"
 #include "CbmRichTrackExtrapolationLittrack.h"
 #include "CbmRichTrackExtrapolationMirrorIdeal.h"
-//#include "CbmL1RichENNRingFinderParallel.h"
 //#include "prototype/CbmRichProtRingFinderHough.h"
 
 #include "CbmEvent.h"
@@ -197,13 +197,14 @@ void CbmRichReconstruction::InitFinder()
   else if (fFinderName == "ideal") {
     fRingFinder = new CbmRichRingFinderIdeal();
   }
-  /* else if (fFinderName == "enn") {
-     fRingFinder = new CbmL1RichENNRingFinder(0);
-     }
-     else if ((fFinderName == "enn_parallel")) {
-
-     fRingFinder = new CbmL1RichENNRingFinderParallel(0);
-     } else if (fFinderName == "hough_prototype") {
+  else if (fFinderName == "enn") {
+    fRingFinder = new CbmL1RichENNRingFinder(0);
+  }
+  else if ((fFinderName == "enn_parallel")) {
+    fRingFinder = new CbmL1RichENNRingFinderParallel(0);
+  }
+  /*
+  else if (fFinderName == "hough_prototype") {
      fRingFinder = new CbmRichProtRingFinderHough();
      }*/
   else {

reco/detectors/rich/alignment/CbmRichReconstruction.cxx

@@ -16,7 +16,8 @@
 #include "CbmRichRing.h"
 //#include "prototype/CbmRichProtProjectionProducer.h"
 
-//#include "CbmL1RichENNRingFinder.h"
+#include "CbmL1RichENNRingFinder.h"
+#include "CbmL1RichENNRingFinderParallel.h"
 #include "CbmRichRingFinderHough.h"
 #include "CbmRichRingFinderIdeal.h"
 #include "CbmRichTrackExtrapolationBase.h"
@@ -24,7 +25,6 @@
 #include "CbmRichTrackExtrapolationKF.h"
 #include "CbmRichTrackExtrapolationLittrack.h"
 #include "CbmRichTrackExtrapolationMirrorIdeal.h"
-//#include "CbmL1RichENNRingFinderParallel.h"
 //#include "prototype/CbmRichProtRingFinderHough.h"
 
 #include "CbmGlobalTrack.h"
@@ -172,12 +172,14 @@ void CbmRichReconstruction::InitFinder()
   else if (fFinderName == "ideal") {
     fRingFinder = new CbmRichRingFinderIdeal();
   }
-  /*else if (fFinderName == "enn") {
+  else if (fFinderName == "enn") {
     fRingFinder = new CbmL1RichENNRingFinder(0);
-    }
-    else if ((fFinderName == "enn_parallel")) {
+  }
+  else if ((fFinderName == "enn_parallel")) {
     fRingFinder = new CbmL1RichENNRingFinderParallel(0);
-    } else if (fFinderName == "hough_prototype") {
+  }
+  /*
+    else if (fFinderName == "hough_prototype") {
     fRingFinder = new CbmRichProtRingFinderHough();
     }*/
   else {

reco/L1/OffLineInterface/CbmL1RichENNRingFinder.cxx → reco/detectors/rich/finder/CbmL1RichENNRingFinder.cxx

@@ -46,9 +46,7 @@ using std::sqrt;
 using std::vector;
 
 
-ClassImp(CbmL1RichENNRingFinder)
-
-  CbmL1RichENNRingFinder::CbmL1RichENNRingFinder(Int_t verbose)
+CbmL1RichENNRingFinder::CbmL1RichENNRingFinder(Int_t verbose)
   : finder(new CbmL1RichENNRingFinderParallel(verbose))
   , fRecoTime(0)
   , fNEvents(0)

reco/L1/OffLineInterface/CbmL1RichENNRingFinder.h → reco/detectors/rich/finder/CbmL1RichENNRingFinder.h

@@ -23,9 +23,6 @@
 
 #include "CbmRichRingFinder.h"
 
-#include "TStopwatch.h"
-#include "TString.h"
-
 #include <vector>
 
 class ENNHit;
@@ -61,9 +58,6 @@ private:
   CbmL1RichENNRingFinderParallel* finder;
   Float_t fRecoTime;
   Int_t fNEvents;
-
-public:
-  ClassDef(CbmL1RichENNRingFinder, 1);
 };
 
 #endif

reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.h → reco/detectors/rich/finder/CbmL1RichENNRingFinderParallel.h

@@ -212,8 +212,6 @@ private:
   TStopwatch fTimers[NTimers];    // timers for different parts of algorithm
   TString fTimersNames[NTimers];  // names which are correspond to the timers.
   TStopwatch& GetTimer(TString t);
-
-public:
 };
 
 #endif