Generating dictionaries for vectors of digits, clusters and tracks

iouribelikov · sawenzel · commit 4bd12f67330c · 2018-02-28T21:20:14.000+01:00
diff --git a/DataFormats/Detectors/ITSMFT/ITS/src/DataFormatsITSLinkDef.h b/DataFormats/Detectors/ITSMFT/ITS/src/DataFormatsITSLinkDef.h
@@ -14,5 +14,6 @@
 #pragma link off all classes;
 #pragma link off all functions;
 #pragma link C++ class o2::ITS::TrackITS + ;
+#pragma link C++ class std::vector<o2::ITS::TrackITS> + ;
 
 #endif
diff --git a/DataFormats/Detectors/ITSMFT/common/src/ITSMFTDataFormatsLinkDef.h b/DataFormats/Detectors/ITSMFT/common/src/ITSMFTDataFormatsLinkDef.h
@@ -15,6 +15,7 @@
 #pragma link off all functions;
 
 #pragma link C++ class o2::ITSMFT::Cluster + ;
+#pragma link C++ class std::vector<o2::ITSMFT::Cluster> + ;
 #pragma link C++ class o2::ITSMFT::ClusterTopology + ;
 #pragma link C++ class o2::ITSMFT::TopologyDictionary + ;
 
diff --git a/Detectors/ITSMFT/ITS/macros/test/CheckClusters.C b/Detectors/ITSMFT/ITS/macros/test/CheckClusters.C
@@ -52,13 +52,7 @@ void CheckClusters(Int_t nEvents = 10, TString mcEngine = "TGeant3")
   TFile* file1 = TFile::Open(filename);
   TTree* clusTree = (TTree*)gFile->Get("o2sim");
   std::vector<Cluster>* clusArr = nullptr;
-  // clusTree->SetBranchAddress("ITSCluster",&clusArr); // Why this does not work ???
-  auto* branch = clusTree->GetBranch("ITSCluster");
-  if (!branch) {
-    std::cout << "No clusters !" << std::endl;
-    return;
-  }
-  branch->SetAddress(&clusArr);
+  clusTree->SetBranchAddress("ITSCluster",&clusArr);
   // Cluster MC labels
   o2::dataformats::MCTruthContainer<o2::MCCompLabel>* clusLabArr = nullptr;
   clusTree->SetBranchAddress("ITSClusterMCTruth", &clusLabArr);
diff --git a/Detectors/ITSMFT/ITS/macros/test/CheckTopologies.C b/Detectors/ITSMFT/ITS/macros/test/CheckTopologies.C
@@ -59,13 +59,7 @@ void CheckTopologies(Int_t nEvents = 10, TString mcEngine = "TGeant3")
   TFile* file1 = TFile::Open(filename);
   TTree* clusTree = (TTree*)gFile->Get("o2sim");
   std::vector<Cluster>* clusArr = nullptr;
-  // clusTree->SetBranchAddress("ITSCluster",&clusArr); // Why this does not work ???
-  auto* branch = clusTree->GetBranch("ITSCluster");
-  if (!branch) {
-    std::cout << "No clusters !" << std::endl;
-    return;
-  }
-  branch->SetAddress(&clusArr);
+  clusTree->SetBranchAddress("ITSCluster",&clusArr);
   // Cluster MC labels
   o2::dataformats::MCTruthContainer<o2::MCCompLabel>* clusLabArr = nullptr;
   clusTree->SetBranchAddress("ITSClusterMCTruth", &clusLabArr);
diff --git a/Detectors/ITSMFT/ITS/macros/test/DisplayTrack.C b/Detectors/ITSMFT/ITS/macros/test/DisplayTrack.C
@@ -127,13 +127,7 @@ void DisplayTrack(Int_t nEvents = 10, TString mcEngine = "TGeant3", Int_t event
   points->SetMarkerColor(kMagenta);
 
   std::vector<Cluster>* clusArr = nullptr;
-  // tree->SetBranchAddress("ITSCluster",&clusArr); // Why this does not work ???
-  auto* branch = tree->GetBranch("ITSCluster");
-  if (!branch) {
-    std::cout << "No clusters !" << std::endl;
-    return;
-  }
-  branch->SetAddress(&clusArr);
+  tree->SetBranchAddress("ITSCluster",&clusArr);
   // Cluster MC labels
   o2::dataformats::MCTruthContainer<o2::MCCompLabel>* clsLabArr = nullptr;
   tree->SetBranchAddress("ITSClusterMCTruth", &clsLabArr);
diff --git a/Detectors/ITSMFT/common/base/src/ITSMFTBaseLinkDef.h b/Detectors/ITSMFT/common/base/src/ITSMFTBaseLinkDef.h
@@ -16,6 +16,7 @@
 
 #pragma link C++ class o2::ITSMFT::SDigit+;
 #pragma link C++ class o2::ITSMFT::Digit+;
+#pragma link C++ class std::vector<o2::ITSMFT::Digit>+;
 #pragma link C++ class o2::ITSMFT::SegmentationAlpide+;
 //#pragma link C++ class o2::ITS::ContainerFactory;
 //#pragma link C++ class o2::ITS::MisalignmentParameter+;
