Change branch name for TPC cluster MC labels; Remove empty file

sawenzel · sawenzel · commit f0d5f798484e · 2017-11-22T09:41:37.000+01:00
This is a small usability improvement: We need to add a trailing
dot (.) to some branch names (when they are a TNamed) otherwise ROOT
cannot draw from these branches in a TBrowser

Remove empty source file
diff --git a/Detectors/TPC/reconstruction/CMakeLists.txt b/Detectors/TPC/reconstruction/CMakeLists.txt
@@ -8,7 +8,6 @@ set(SRCS
    src/AdcClockMonitor.cxx
    src/BoxClusterer.cxx
    src/Cluster.cxx
-   src/Clusterer.cxx
    src/ClusterContainer.cxx
    src/ClustererTask.cxx
    src/GBTFrame.cxx
diff --git a/Detectors/TPC/reconstruction/macro/readClusterMCtruth.C b/Detectors/TPC/reconstruction/macro/readClusterMCtruth.C
@@ -32,7 +32,7 @@ void readClusterMCtruth(std::string filename)
 
   o2::dataformats::MCTruthContainer<o2::MCCompLabel> mMCTruthArray;
   o2::dataformats::MCTruthContainer<o2::MCCompLabel> *mcTruthArray(&mMCTruthArray);
-  clusterTree->SetBranchAddress("TPCClusterHWMCTruth", &mcTruthArray);
+  clusterTree->SetBranchAddress("TPCClusterHWMCTruth.", &mcTruthArray);
 
   for(int iEvent=0; iEvent<clusterTree->GetEntriesFast(); ++iEvent) {
     int cluster = 0;
@@ -47,5 +47,4 @@ void readClusterMCtruth(std::string filename)
       ++cluster;
     }
   }
-
 }
diff --git a/Detectors/TPC/reconstruction/src/Clusterer.cxx b/Detectors/TPC/reconstruction/src/Clusterer.cxx
diff --git a/Detectors/TPC/reconstruction/src/ClustererTask.cxx b/Detectors/TPC/reconstruction/src/ClustererTask.cxx
@@ -90,7 +90,7 @@ InitStatus ClustererTask::Init()
 
     // Register MC Truth output container
     mClustersMCTruthArray = std::make_unique<MCLabelContainer>();
-    mgr->Register("TPCClusterMCTruth", "TPC", mClustersMCTruthArray.get(), kTRUE);
+    mgr->Register("TPCClusterMCTruth.", "TPC", mClustersMCTruthArray.get(), kTRUE);
 
     // create clusterer and pass output pointer
     mBoxClusterer = std::make_unique<BoxClusterer>(mClustersArray);
@@ -103,7 +103,7 @@ InitStatus ClustererTask::Init()
 
     // Register MC Truth output container
     mHwClustersMCTruthArray = std::make_unique<MCLabelContainer>();
-    mgr->Register("TPCClusterHWMCTruth", "TPC", mHwClustersMCTruthArray.get(), kTRUE);
+    mgr->Register("TPCClusterHWMCTruth.", "TPC", mHwClustersMCTruthArray.get(), kTRUE);
 
      // create clusterer and pass output pointer
     mHwClusterer = std::make_unique<HwClusterer>(mHwClustersArray,mHwClustersMCTruthArray.get());//,0,359);

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ void readClusterMCtruth(std::string filename)`
`32`	`32`
`33`	`33`	`o2::dataformats::MCTruthContainer<o2::MCCompLabel> mMCTruthArray;`
`34`	`34`	`o2::dataformats::MCTruthContainer<o2::MCCompLabel> *mcTruthArray(&mMCTruthArray);`
`35`		`- clusterTree->SetBranchAddress("TPCClusterHWMCTruth", &mcTruthArray);`
	`35`	`+ clusterTree->SetBranchAddress("TPCClusterHWMCTruth.", &mcTruthArray);`
`36`	`36`
`37`	`37`	`for(int iEvent=0; iEvent<clusterTree->GetEntriesFast(); ++iEvent) {`
`38`	`38`	`int cluster = 0;`
`@@ -47,5 +47,4 @@ void readClusterMCtruth(std::string filename)`
`47`	`47`	`++cluster;`
`48`	`48`	`}`
`49`	`49`	`}`
`50`		`-`
`51`	`50`	`}`