Merge pull request #49200 from AdrianoDee/fix_hit_track_writing

cmsbuild · web-flow · commit 96d364efee0c · 2025-10-23T23:50:16.000+02:00
Fix Hit and Track SoA Writing to File
diff --git a/DataFormats/TrackSoA/src/classes.cc b/DataFormats/TrackSoA/src/classes.cc
@@ -1,5 +1,4 @@
 #include "DataFormats/Portable/interface/PortableHostCollectionReadRules.h"
 #include "DataFormats/TrackSoA/interface/TracksHost.h"
 
-using namespace reco;
-SET_PORTABLEHOSTMULTICOLLECTION_READ_RULES(TracksHost);
+SET_PORTABLEHOSTMULTICOLLECTION_READ_RULES(reco::TracksHost);
diff --git a/DataFormats/TrackSoA/test/TestReadHostTrackSoA.cc b/DataFormats/TrackSoA/test/TestReadHostTrackSoA.cc
@@ -23,15 +23,20 @@ namespace edmtest {
 
   private:
     edm::EDGetTokenT<::reco::TracksHost> getToken_;
+    const unsigned int trackSize_;
   };
 
   TestReadHostTrackSoA::TestReadHostTrackSoA(edm::ParameterSet const& iPSet)
-      : getToken_(consumes(iPSet.getParameter<edm::InputTag>("input"))) {}
+      : getToken_(consumes(iPSet.getParameter<edm::InputTag>("input"))),
+        trackSize_(iPSet.getParameter<unsigned int>("trackSize")) {}
 
   void TestReadHostTrackSoA::analyze(edm::StreamID, edm::Event const& iEvent, edm::EventSetup const&) const {
     auto const& tracks = iEvent.get(getToken_);
     auto tracksView = tracks.view();
 
+    assert(tracksView.metadata().size() == int(trackSize_));
+    assert(tracksView.nTracks() == int(trackSize_));
+
     for (int i = 0; i < tracksView.metadata().size(); ++i) {
       if (tracksView[i].eta() != float(i)) {
         throw cms::Exception("TestReadHostTrackSoA Failure") << "TestReadHostTrackSoA::analyze, entry. i = " << i;
@@ -42,6 +47,7 @@ namespace edmtest {
   void TestReadHostTrackSoA::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
     edm::ParameterSetDescription desc;
     desc.add<edm::InputTag>("input");
+    desc.add<unsigned int>("trackSize", 1000);
     descriptions.addDefault(desc);
   }
 }  // namespace edmtest
diff --git a/DataFormats/TrackSoA/test/TestWriteHostTrackSoA.cc b/DataFormats/TrackSoA/test/TestWriteHostTrackSoA.cc
@@ -23,7 +23,7 @@ namespace edmtest {
     static void fillDescriptions(edm::ConfigurationDescriptions&);
 
   private:
-    unsigned int trackSize_;
+    const unsigned int trackSize_;
     edm::EDPutTokenT<::reco::TracksHost> putToken_;
   };
 
@@ -36,6 +36,7 @@ namespace edmtest {
     for (unsigned int i = 0; i < trackSize_; ++i) {
       tracksView[i].eta() = float(i);
     }
+    tracksView.nTracks() = trackSize_;
     iEvent.emplace(putToken_, std::move(tracks));
   }
 
diff --git a/DataFormats/TrackSoA/test/testReadHostTrackSoA.py b/DataFormats/TrackSoA/test/testReadHostTrackSoA.py
@@ -6,7 +6,8 @@
 process.source = cms.Source("PoolSource", fileNames = cms.untracked.vstring("file:"+sys.argv[1]))
 
 process.testReadHostTrackSoA = cms.EDAnalyzer("TestReadHostTrackSoA",
-    input = cms.InputTag("trackSoA", "", "WRITE")
+    input = cms.InputTag("trackSoA", "", "WRITE"),
+    trackSize = cms.uint32(2708)
 )
 
 process.out = cms.OutputModule("PoolOutputModule",
diff --git a/DataFormats/TrackSoA/test/testWriteHostTrackSoA.py b/DataFormats/TrackSoA/test/testWriteHostTrackSoA.py
@@ -17,6 +17,3 @@
 
 process.path = cms.Path(process.trackSoA)
 process.endPath = cms.EndPath(process.out)
-
-'testTrackSoAWriter.root'
-
diff --git a/DataFormats/TrackingRecHitSoA/src/classes.cc b/DataFormats/TrackingRecHitSoA/src/classes.cc
@@ -1,5 +1,4 @@
 #include "DataFormats/Portable/interface/PortableHostCollectionReadRules.h"
 #include "DataFormats/TrackingRecHitSoA/interface/TrackingRecHitsHost.h"
 
-using namespace reco;
-SET_PORTABLEHOSTMULTICOLLECTION_READ_RULES(HitPortableCollectionHost);
+SET_PORTABLEHOSTMULTICOLLECTION_READ_RULES(reco::HitPortableCollectionHost);
diff --git a/DataFormats/TrackingRecHitSoA/test/TestReadHostHitSoA.cc b/DataFormats/TrackingRecHitSoA/test/TestReadHostHitSoA.cc
@@ -27,15 +27,23 @@ namespace edmtest {
 
   private:
     edm::EDGetTokenT<HitsOnHost> getToken_;
+    const unsigned int hitSize_;
+    const unsigned int offsetBPIX2_;
   };
 
   TestReadHostHitSoA::TestReadHostHitSoA(edm::ParameterSet const& iPSet)
-      : getToken_(consumes(iPSet.getParameter<edm::InputTag>("input"))) {}
+      : getToken_(consumes(iPSet.getParameter<edm::InputTag>("input"))),
+        hitSize_(iPSet.getParameter<unsigned int>("hitSize")),
+        offsetBPIX2_(iPSet.getParameter<unsigned int>("offsetBPIX2")) {}
 
   void TestReadHostHitSoA::analyze(edm::StreamID, edm::Event const& iEvent, edm::EventSetup const&) const {
     auto const& hits = iEvent.get(getToken_);
     auto hitsView = hits.view();
 
+    std::cout << "hitsView.metadata().size() = " << hitsView.metadata().size() << std::endl;
+    assert(hitsView.metadata().size() == int(hitSize_));
+    assert(hitsView.offsetBPIX2() == int(offsetBPIX2_));
+
     for (int i = 0; i < hitsView.metadata().size(); ++i) {
       if (hitsView[i].xGlobal() != float(i)) {
         throw cms::Exception("TestWriteHostHitSoA Failure") << "TestReadHostHitSoA::analyze, entry. i = " << i;
@@ -46,6 +54,8 @@ namespace edmtest {
   void TestReadHostHitSoA::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
     edm::ParameterSetDescription desc;
     desc.add<edm::InputTag>("input");
+    desc.add<unsigned int>("hitSize", 1000);
+    desc.add<unsigned int>("offsetBPIX2", 50);
     descriptions.addDefault(desc);
   }
 }  // namespace edmtest
diff --git a/DataFormats/TrackingRecHitSoA/test/TestWriteHostHitSoA.cc b/DataFormats/TrackingRecHitSoA/test/TestWriteHostHitSoA.cc
@@ -25,25 +25,30 @@ namespace edmtest {
     using HitsOnHost = ::reco::TrackingRecHitHost;
 
   private:
-    unsigned int hitSize_;
+    const unsigned int hitSize_;
+    const unsigned int offsetBPIX2_;
     edm::EDPutTokenT<HitsOnHost> putToken_;
   };
 
   TestWriteHostHitSoA::TestWriteHostHitSoA(edm::ParameterSet const& iPSet)
-      : hitSize_(iPSet.getParameter<unsigned int>("hitSize")), putToken_(produces()) {}
+      : hitSize_(iPSet.getParameter<unsigned int>("hitSize")),
+        offsetBPIX2_(iPSet.getParameter<unsigned int>("offsetBPIX2")),
+        putToken_(produces()) {}
 
   void TestWriteHostHitSoA::produce(edm::StreamID, edm::Event& iEvent, edm::EventSetup const&) const {
     HitsOnHost hits(cms::alpakatools::host(), hitSize_, 100);
     auto hitsView = hits.view();
     for (unsigned int i = 0; i < hitSize_; ++i) {
       hitsView[i].xGlobal() = float(i);
     }
+    hitsView.offsetBPIX2() = offsetBPIX2_;
     iEvent.emplace(putToken_, std::move(hits));
   }
 
   void TestWriteHostHitSoA::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
     edm::ParameterSetDescription desc;
     desc.add<unsigned int>("hitSize", 1000);
+    desc.add<unsigned int>("offsetBPIX2", 50);
     descriptions.addDefault(desc);
   }
 }  // namespace edmtest
diff --git a/DataFormats/TrackingRecHitSoA/test/testReadHostHitSoA.py b/DataFormats/TrackingRecHitSoA/test/testReadHostHitSoA.py
@@ -6,7 +6,8 @@
 process.source = cms.Source("PoolSource", fileNames = cms.untracked.vstring("file:"+sys.argv[1]))
 
 process.testReadHostHitSoA = cms.EDAnalyzer("TestReadHostHitSoA",
-    input = cms.InputTag("hitSoA", "", "WRITE")
+    input = cms.InputTag("hitSoA", "", "WRITE"),
+    hitSize = cms.uint32(2708)
 )
 
 process.out = cms.OutputModule("PoolOutputModule",
diff --git a/DataFormats/TrackingRecHitSoA/test/testWriteHostHitSoA.py b/DataFormats/TrackingRecHitSoA/test/testWriteHostHitSoA.py
@@ -8,11 +8,11 @@
 process.maxEvents.input = 5
 
 process.hitSoA = cms.EDProducer("TestWriteHostHitSoA",
-    hitSize = cms.uint32(2708)
+    hitSize = cms.uint32(2708),
 )
 
 process.out = cms.OutputModule("PoolOutputModule",
-    fileName = cms.untracked.string(sys.argv[1])
+    fileName = cms.untracked.string(sys.argv[1]),
 )
 
 process.path = cms.Path(process.hitSoA)
diff --git a/DataFormats/VertexSoA/test/BuildFile.xml b/DataFormats/VertexSoA/test/BuildFile.xml
@@ -1,6 +1,25 @@
+<use name="alpaka"/>
+<use name="rootcore"/>
+<use name="eigen"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/Portable"/>
+<use name="DataFormats/SoATemplate" source_only="1"/>
+
+
 <bin file="alpaka/ZVertexSoA_test.cc alpaka/ZVertexSoA_test.dev.cc" name="ZVertexSoA_test">
   <use name="alpaka"/>
   <use name="eigen"/>
   <use name="HeterogeneousCore/AlpakaInterface"/>
 <flags ALPAKA_BACKENDS="1"/>
 </bin>
+
+<library name="testVertexSoA" file="TestWriteHostVertexSoA.cc,TestReadHostVertexSoA.cc,">
+  <flags EDM_PLUGIN="1"/>
+  <use name="alpaka"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="FWCore/Utilities"/>
+</library>
+
+<test name="testWriteAndReadVertexSoA" command="testWriteAndReadVertexSoA.sh" />
+
diff --git a/DataFormats/VertexSoA/test/TestReadHostVertexSoA.cc b/DataFormats/VertexSoA/test/TestReadHostVertexSoA.cc
@@ -0,0 +1,52 @@
+#include "DataFormats/DetId/interface/DetId.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/global/EDAnalyzer.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
+#include "FWCore/Utilities/interface/EDGetToken.h"
+#include "FWCore/Utilities/interface/Exception.h"
+#include "FWCore/Utilities/interface/InputTag.h"
+#include "FWCore/Utilities/interface/StreamID.h"
+
+#include "DataFormats/VertexSoA/interface/ZVertexHost.h"
+
+namespace edmtest {
+
+  class TestReadHostVertexSoA : public edm::global::EDAnalyzer<> {
+  public:
+    TestReadHostVertexSoA(edm::ParameterSet const&);
+    void analyze(edm::StreamID, edm::Event const&, edm::EventSetup const&) const override;
+    static void fillDescriptions(edm::ConfigurationDescriptions&);
+
+  private:
+    edm::EDGetTokenT<ZVertexHost> getToken_;
+  };
+
+  TestReadHostVertexSoA::TestReadHostVertexSoA(edm::ParameterSet const& iPSet)
+      : getToken_(consumes(iPSet.getParameter<edm::InputTag>("input"))) {}
+
+  void TestReadHostVertexSoA::analyze(edm::StreamID, edm::Event const& iEvent, edm::EventSetup const&) const {
+    auto const& ZVertexs = iEvent.get(getToken_);
+    auto ZVertexsView = ZVertexs.view();
+
+    std::cout << "ZVertexsView.metadata().size() " << ZVertexsView.metadata().size() << std::endl;
+    std::cout << "ZVertexsView.chi2() " << ZVertexsView[10].chi2() << std::endl;
+    for (int i = 0; i < ZVertexsView.metadata().size(); ++i) {
+      if (ZVertexsView[i].chi2() != float(i)) {
+        throw cms::Exception("TestReadHostVertexSoA Failure") << "TestReadHostVertexSoA::analyze, entry. i = " << i;
+      }
+    }
+  }
+
+  void TestReadHostVertexSoA::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+    edm::ParameterSetDescription desc;
+    desc.add<edm::InputTag>("input");
+    descriptions.addDefault(desc);
+  }
+}  // namespace edmtest
+
+using edmtest::TestReadHostVertexSoA;
+DEFINE_FWK_MODULE(TestReadHostVertexSoA);
diff --git a/DataFormats/VertexSoA/test/TestWriteHostVertexSoA.cc b/DataFormats/VertexSoA/test/TestWriteHostVertexSoA.cc
@@ -0,0 +1,50 @@
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/global/EDProducer.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
+#include "FWCore/Utilities/interface/EDPutToken.h"
+#include "FWCore/Utilities/interface/StreamID.h"
+
+#include "DataFormats/VertexSoA/interface/ZVertexHost.h"
+
+#include <memory>
+#include <utility>
+#include <vector>
+
+namespace edmtest {
+
+  class TestWriteHostVertexSoA : public edm::global::EDProducer<> {
+  public:
+    TestWriteHostVertexSoA(edm::ParameterSet const&);
+    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override;
+    static void fillDescriptions(edm::ConfigurationDescriptions&);
+
+  private:
+    unsigned int vertexSize_;
+    edm::EDPutTokenT<ZVertexHost> putToken_;
+  };
+
+  TestWriteHostVertexSoA::TestWriteHostVertexSoA(edm::ParameterSet const& iPSet)
+      : vertexSize_(iPSet.getParameter<unsigned int>("vertexSize")), putToken_(produces()) {}
+
+  void TestWriteHostVertexSoA::produce(edm::StreamID, edm::Event& iEvent, edm::EventSetup const&) const {
+    ZVertexHost ZVertexs({{int(vertexSize_), int(4 * vertexSize_)}}, cms::alpakatools::host());
+    auto ZVertexsView = ZVertexs.view();
+    for (unsigned int i = 0; i < vertexSize_; ++i) {
+      ZVertexsView[i].chi2() = float(i);
+    }
+    iEvent.emplace(putToken_, std::move(ZVertexs));
+  }
+
+  void TestWriteHostVertexSoA::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+    edm::ParameterSetDescription desc;
+    desc.add<unsigned int>("vertexSize", 1000);
+    descriptions.addDefault(desc);
+  }
+}  // namespace edmtest
+
+using edmtest::TestWriteHostVertexSoA;
+DEFINE_FWK_MODULE(TestWriteHostVertexSoA);
diff --git a/DataFormats/VertexSoA/test/testReadHostVertexSoA.py b/DataFormats/VertexSoA/test/testReadHostVertexSoA.py
@@ -0,0 +1,20 @@
+import FWCore.ParameterSet.Config as cms
+import sys
+
+process = cms.Process("READ")
+
+process.source = cms.Source("PoolSource", fileNames = cms.untracked.vstring("file:"+sys.argv[1]))
+
+process.testReadHostVertexSoA = cms.EDAnalyzer("TestReadHostVertexSoA",
+    input = cms.InputTag("vertexSoA", "", "WRITE")
+)
+
+process.out = cms.OutputModule("PoolOutputModule",
+    fileName = cms.untracked.string('testVertexSoAReader.root'),
+    fastCloning = cms.untracked.bool(False)
+)
+
+process.path = cms.Path(process.testReadHostVertexSoA)
+
+process.endPath = cms.EndPath(process.out)
+
diff --git a/DataFormats/VertexSoA/test/testWriteAndReadVertexSoA.sh b/DataFormats/VertexSoA/test/testWriteAndReadVertexSoA.sh
@@ -0,0 +1,22 @@
+echo '#### Test Writing and Reading TrackSoA'
+
+scriptdir=$CMSSW_BASE/src/DataFormats/VertexSoA/test/
+
+echo '> Writing'
+
+cmsRun ${scriptdir}/testWriteHostVertexSoA.py testVertexSoA.root
+
+if [ $? -ne 0 ]; then
+    exit 1;
+fi
+
+echo '> Reading'
+
+cmsRun ${scriptdir}/testReadHostVertexSoA.py testVertexSoA.root
+
+if [ $? -ne 0 ]; then
+    exit 1;
+fi
+
+echo '>>>> Done! <<<<'
+
diff --git a/DataFormats/VertexSoA/test/testWriteHostVertexSoA.py b/DataFormats/VertexSoA/test/testWriteHostVertexSoA.py
@@ -0,0 +1,19 @@
+import FWCore.ParameterSet.Config as cms
+
+process = cms.Process("WRITE")
+
+process.load("FWCore.MessageService.MessageLogger_cfi")
+
+process.source = cms.Source("EmptySource")
+process.maxEvents.input = 5
+
+process.vertexSoA = cms.EDProducer("TestWriteHostVertexSoA",
+    vertexSize = cms.uint32(2708)
+)
+
+process.out = cms.OutputModule("PoolOutputModule",
+    fileName = cms.untracked.string(sys.argv[1])
+)
+
+process.path = cms.Path(process.vertexSoA)
+process.endPath = cms.EndPath(process.out)

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ namespace edmtest {`
`23`	`23`	`static void fillDescriptions(edm::ConfigurationDescriptions&);`
`24`	`24`
`25`	`25`	`private:`
`26`		`- unsigned int trackSize_;`
	`26`	`+ const unsigned int trackSize_;`
`27`	`27`	`edm::EDPutTokenT<::reco::TracksHost> putToken_;`
`28`	`28`	`};`
`29`	`29`
`@@ -36,6 +36,7 @@ namespace edmtest {`
`36`	`36`	`for (unsigned int i = 0; i < trackSize_; ++i) {`
`37`	`37`	`tracksView[i].eta() = float(i);`
`38`	`38`	`}`
	`39`	`+ tracksView.nTracks() = trackSize_;`
`39`	`40`	`iEvent.emplace(putToken_, std::move(tracks));`
`40`	`41`	`}`
`41`	`42`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,8 @@`
`6`	`6`	`process.source = cms.Source("PoolSource", fileNames = cms.untracked.vstring("file:"+sys.argv[1]))`
`7`	`7`
`8`	`8`	`process.testReadHostTrackSoA = cms.EDAnalyzer("TestReadHostTrackSoA",`
`9`		`- input = cms.InputTag("trackSoA", "", "WRITE")`
	`9`	`+ input = cms.InputTag("trackSoA", "", "WRITE"),`
	`10`	`+ trackSize = cms.uint32(2708)`
`10`	`11`	`)`
`11`	`12`
`12`	`13`	`process.out = cms.OutputModule("PoolOutputModule",`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,8 @@`
`6`	`6`	`process.source = cms.Source("PoolSource", fileNames = cms.untracked.vstring("file:"+sys.argv[1]))`
`7`	`7`
`8`	`8`	`process.testReadHostHitSoA = cms.EDAnalyzer("TestReadHostHitSoA",`
`9`		`- input = cms.InputTag("hitSoA", "", "WRITE")`
	`9`	`+ input = cms.InputTag("hitSoA", "", "WRITE"),`
	`10`	`+ hitSize = cms.uint32(2708)`
`10`	`11`	`)`
`11`	`12`
`12`	`13`	`process.out = cms.OutputModule("PoolOutputModule",`
Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,11 @@`
`8`	`8`	`process.maxEvents.input = 5`
`9`	`9`
`10`	`10`	`process.hitSoA = cms.EDProducer("TestWriteHostHitSoA",`
`11`		`- hitSize = cms.uint32(2708)`
	`11`	`+ hitSize = cms.uint32(2708),`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`process.out = cms.OutputModule("PoolOutputModule",`
`15`		`- fileName = cms.untracked.string(sys.argv[1])`
	`15`	`+ fileName = cms.untracked.string(sys.argv[1]),`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`process.path = cms.Path(process.hitSoA)`