various updates

Control/CalypsoExample/ClusterReadExample/CMakeLists.txt

@@ -9,7 +9,7 @@ atlas_subdir( ClusterReadExample )
 atlas_add_component( ClusterReadExample
                     src/*.cxx src/*.h
                     src/components/*.cxx
-                    LINK_LIBRARIES AthenaBaseComps AthViews StoreGateLib SGtests Identifier GaudiKernel TrackerRawData TrackerPrepRawData FaserDetDescr TrackerIdentifier TrackerReadoutGeometry xAODFaserTrigger TrkTrack TrkEventPrimitives TrkRIO_OnTrack )
+                    LINK_LIBRARIES AthenaBaseComps AthViews StoreGateLib SGtests Identifier GaudiKernel TrackerRawData TrackerPrepRawData FaserDetDescr TrackerIdentifier TrackerReadoutGeometry xAODFaserTrigger TrkTrack TrkEventPrimitives TrkRIO_OnTrack GeneratorObjects)
 
 
 atlas_install_python_modules( python/*.py )

Control/CalypsoExample/ClusterReadExample/python/ClusterReadExampleConfig.py

@@ -6,18 +6,18 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.ComponentFactory import CompFactory
 
 def ClusterReadExampleCfg(flags, **kwargs):
-    """Return ComponentAccumulator for Tracker ClusterFitAlg"""
+    """Return ComponentAccumulator for Tracker ClusterReadAlg"""
     acc = ComponentAccumulator()
     # clusterTool = acc.popToolsAndMerge(FaserSCT_ClusterizationToolCfg(flags))
     # kwargs.setdefault("SCT_ClusteringTool", clusterTool)
     # kwargs.setdefault("DataObjectName", "SCT_RDOs")
     kwargs.setdefault("ClustersName", "SCT_ClusterContainer")
     # kwargs.setdefault("SCT_FlaggedCondData", "SCT_Flags")
-    Tracker__ClusterFitAlg=CompFactory.Tracker.ClusterFitAlg
-    acc.addEventAlgo(Tracker__ClusterFitAlg(**kwargs))
+    Tracker__ClusterReadAlg=CompFactory.Tracker.ClusterReadAlg
+    acc.addEventAlgo(Tracker__ClusterReadAlg(**kwargs))
     
     thistSvc = CompFactory.THistSvc()
-    thistSvc.Output += ["HIST DATAFILE='ClusterFitHistograms.root' OPT='RECREATE'"]
+    thistSvc.Output += ["HIST DATAFILE='ClusterReadHistograms.root' OPT='RECREATE'"]
     acc.addService(thistSvc)
     return acc
 
@@ -33,7 +33,7 @@ if __name__ == "__main__":
     ConfigFlags.IOVDb.GlobalTag = "OFLCOND-XXXX-XXX-XX"          # Needed to bypass autoconfig, only the "OFLCOND" matters at the moment
     ConfigFlags.GeoModel.FaserVersion     = "FASER-01"           # Default FASER geometry
     ConfigFlags.Detector.SimulateFaserSCT = True
-    ConfigFlags.Input.Files = ["my.RDO.pool.root"]
+    ConfigFlags.Input.Files = ["my.HITS.pool.root"]
     ConfigFlags.lock()
 
 # Configure components

Control/CalypsoExample/ClusterReadExample/src/ClusterReadAlg.cxx

@@ -59,6 +59,15 @@ StatusCode ClusterReadAlg::initialize() {
   ATH_CHECK(histSvc()->regHist("/HIST/chi2", m_chi2));
   ATH_CHECK(histSvc()->regTree("/HIST/residTree", m_tree));
 
+  //rdo
+  m_hist = new TH1D("GroupSize", "RDO Group Size", 8, 0, 8); //first string is root object name, second is histogram title
+  m_hprof = new TProfile("IncAngleGroup", "Mean Group Size vs Incident Angle", 10, -.1, .1 ,0,5);
+  m_incAnglHist = new TH1D("IncAngleHist", "Incident Angle Count", 10, -.1, .1);
+  ATH_CHECK(histSvc()->regHist("/HIST/myhist", m_hist));
+  ATH_CHECK(histSvc()->regHist("/HIST/myhistprof", m_hprof));
+  ATH_CHECK(histSvc()->regHist("/HIST/myhistAngl", m_incAnglHist));
+
+
   return StatusCode::SUCCESS;
 }
 

Control/CalypsoExample/ClusterReadExample/src/ClusterReadAlg.h

@@ -31,6 +31,11 @@
 #include <map>
 #include <string>
 
+//RDO
+#include <TH1.h>
+#include <math.h>
+#include <TProfile.h>
+
 class FaserSCT_ID;
 class ISvcLocator;
 class StatusCode;
@@ -103,6 +108,11 @@ class ClusterReadAlg : public AthReentrantAlgorithm, AthHistogramming
     mutable std::atomic<int> m_numberOfClusterCollection{0};
     mutable std::atomic<int> m_numberOfCluster{0};
     mutable std::atomic<int> m_numberOfFits{0};
+
+    //RDO
+    TH1* m_hist;  // Example histogram
+    TH1* m_incAnglHist;
+    TProfile* m_hprof;
 };
 
 // For the THistSvc