[L1-O2O] WriterProxyT changes to use ESGetToken

Alignment/MillePedeAlignmentAlgorithm/test/BuildFile.xml

@@ -5,3 +5,8 @@
   <use name="millepede"/>
   <flags USE_UNITTEST_DIR="1"/>
 </test>
+<bin name="testPedeCampaign" file="TestDriver.cpp">
+  <flags TEST_RUNNER_ARGS="/bin/bash Alignment/MillePedeAlignmentAlgorithm/test test_pede.sh"/>
+  <use name="FWCore/Utilities"/>
+</bin>
+

Alignment/MillePedeAlignmentAlgorithm/test/TestDriver.cpp

@@ -0,0 +1,2 @@
+#include "FWCore/Utilities/interface/TestHelper.h"
+RUNTEST()

Alignment/MillePedeAlignmentAlgorithm/test/test_pede.py

@@ -0,0 +1,100 @@
+import FWCore.ParameterSet.Config as cms
+process = cms.Process("Alignment")
+
+process.Tracer = cms.Service("Tracer")
+
+setupGlobaltag = "121X_mcRun3_2021_realistic_forpp900GeV_v6"
+setupCollection = "ALCARECOTkAlCosmicsCosmicTF0T"
+setupCosmicsDecoMode = True
+setupCosmicsZeroTesla = False
+setupPrimaryWidth     = -1.0
+setupJson             = "placeholder_json"
+setupRunStartGeometry = 1
+setupAlgoMode = "pede"
+setupMonitorFile      = "millePedeMonitorISN.root"
+setupBinaryFile       = "milleBinaryISN.dat"
+readFiles = cms.untracked.vstring()
+
+import Alignment.MillePedeAlignmentAlgorithm.alignmentsetup.GeneralSetup as generalSetup
+generalSetup.setup(process, setupGlobaltag, setupCosmicsZeroTesla)
+
+
+################################################################################
+# setup alignment producer
+################################################################################
+import Alignment.MillePedeAlignmentAlgorithm.alignmentsetup.ConfigureAlignmentProducer as confAliProducer
+
+confAliProducer.setConfiguration(process,
+    collection   = setupCollection,
+    mode         = setupAlgoMode,
+    monitorFile  = setupMonitorFile,
+    binaryFile   = setupBinaryFile,
+    primaryWidth = setupPrimaryWidth,
+    cosmicsZeroTesla = setupCosmicsZeroTesla)
+
+
+################################################################################
+# Overwrite some conditions in global tag
+################################################################################
+import Alignment.MillePedeAlignmentAlgorithm.alignmentsetup.SetCondition as tagwriter
+
+################################################################################
+# insert Startgeometry 
+################################################################################
+# You can use tagwriter.setCondition() to overwrite conditions in globaltag
+
+################################################################################
+# insert Alignables 
+################################################################################
+process.AlignmentProducer.ParameterBuilder.parameterTypes = ["SelectorRigid,RigidBody"]
+
+################################################################################
+# Define the high-level structure alignables
+################################################################################
+process.AlignmentProducer.ParameterBuilder.SelectorRigid = cms.PSet(
+    alignParams = cms.vstring(
+        "TrackerP1PXBHalfBarrel,111111",
+        "TrackerP1PXECHalfCylinder,111111",
+        "TrackerTIBHalfBarrel,111111",
+        "TrackerTOBHalfBarrel,rrrrrr",
+        "TrackerTIDEndcap,111111",
+        "TrackerTECEndcap,111111",
+    )
+)
+
+################################################################################
+# insert Pedesettings 
+################################################################################
+import Alignment.MillePedeAlignmentAlgorithm.alignmentsetup.helper as helper
+helper.set_pede_option(process, "skipemptycons")
+
+################################################################################
+# Mille-procedure
+################################################################################
+if setupAlgoMode == "mille":
+    import Alignment.MillePedeAlignmentAlgorithm.alignmentsetup.MilleSetup as mille
+    mille.setup(process,
+                input_files        = readFiles,
+                collection         = setupCollection,
+                json_file          = setupJson,
+                cosmics_zero_tesla = setupCosmicsZeroTesla,
+                cosmics_deco_mode  = setupCosmicsDecoMode)
+
+################################################################################
+# Pede-procedure
+################################################################################
+else:
+    merge_binary_files = [
+                'milleBinary001.dat',
+                'milleBinary002.dat',
+                'milleBinary003.dat']
+    merge_tree_files   = [
+                'treeFile001.root',
+                'treeFile002.root',
+                'treeFile003.root']
+
+    import Alignment.MillePedeAlignmentAlgorithm.alignmentsetup.PedeSetup as pede
+    pede.setup(process,
+               binary_files = merge_binary_files,
+               tree_files = merge_tree_files,
+               run_start_geometry = setupRunStartGeometry)

Alignment/MillePedeAlignmentAlgorithm/test/test_pede.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+function die { echo $1: status $2; exit $2; }
+
+if [ "${SCRAM_TEST_NAME}" != "" ] ; then
+  mkdir ${SCRAM_TEST_NAME}
+  cd ${SCRAM_TEST_NAME}
+fi
+
+if test -f "milleBinary00*"; then
+    echo "cleaning the local test area"
+    rm -fr milleBinary00* 
+    rm -fr pedeSteer* 
+fi
+
+pwd
+echo " testing Aligment/MillePedeAlignmentAlgorithm"
+
+REMOTE="/store/group/alca_global/tkal_millepede_tests/"
+TESTPACKAGE="test_pede_package.tar"
+COMMMAND=`xrdfs cms-xrd-global.cern.ch locate ${REMOTE}${TESTPACKAGE}`
+STATUS=$?
+echo "xrdfs command status = "$STATUS
+if [ $STATUS -eq 0 ]; then
+    echo "Using file ${TESTPACKAGE}. Running in ${LOCAL_TEST_DIR}."
+    xrdcp root://cms-xrd-global.cern.ch/${REMOTE}${TESTPACKAGE} ${LOCAL_TEST_DIR}
+    tar -xvf ${LOCAL_TEST_DIR}/${TESTPACKAGE} 
+    gunzip milleBinary00*    
+    (cmsRun ${LOCAL_TEST_DIR}/test_pede.py) || die 'failed running test_pede.py' $?
+    echo -e "\n MillePede Exit Status: "`cat millepede.end`
+else 
+  die "SKIPPING test, file ${TESTPACKAGE} not found" 0
+fi

CUDADataFormats/CaloCommon/src/classes_def.xml

@@ -2,7 +2,7 @@
     <enum name="calo::common::tags::Ptr"/>
     <enum name="calo::common::tags::Vec"/>
     <enum name="calo::common::tags::DevPtr"/>
-    <class name="calo::common::AddSize<calo::common::tags::Ptr>"/>
-    <class name="calo::common::AddSize<calo::common::tags::Vec>"/>
-    <class name="calo::common::AddSize<calo::common::tags::DevPtr>"/>
+    <class name="calo::common::AddSize<calo::common::tags::Ptr>" persistent="false"/>
+    <class name="calo::common::AddSize<calo::common::tags::Vec>" persistent="false"/>
+    <class name="calo::common::AddSize<calo::common::tags::DevPtr>" persistent="false"/>
 </lcgdict>

CUDADataFormats/HcalDigi/src/classes_def.xml

@@ -1,14 +1,14 @@
 <lcgdict>
-    <class name="hcal::DigiCollectionBase<calo::common::VecStoragePolicy<std::allocator>>" />
-    <class name="hcal::DigiCollectionBase<calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>" />
+    <class name="hcal::DigiCollectionBase<calo::common::VecStoragePolicy<std::allocator>>" persistent="false" />
+    <class name="hcal::DigiCollectionBase<calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>" persistent="false" />
 
-    <class name="hcal::DigiCollection<hcal::Flavor1, calo::common::VecStoragePolicy<std::allocator>>" />
-    <class name="hcal::DigiCollection<hcal::Flavor3, calo::common::VecStoragePolicy<std::allocator>>" />
-    <class name="hcal::DigiCollection<hcal::Flavor5, calo::common::VecStoragePolicy<std::allocator>>" />
+    <class name="hcal::DigiCollection<hcal::Flavor1, calo::common::VecStoragePolicy<std::allocator>>" persistent="false" />
+    <class name="hcal::DigiCollection<hcal::Flavor3, calo::common::VecStoragePolicy<std::allocator>>" persistent="false" />
+    <class name="hcal::DigiCollection<hcal::Flavor5, calo::common::VecStoragePolicy<std::allocator>>" persistent="false" />
 
-    <class name="hcal::DigiCollection<hcal::Flavor1, calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>" />
-    <class name="hcal::DigiCollection<hcal::Flavor3, calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>" />
-    <class name="hcal::DigiCollection<hcal::Flavor5, calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>" />
+    <class name="hcal::DigiCollection<hcal::Flavor1, calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>" persistent="false" />
+    <class name="hcal::DigiCollection<hcal::Flavor3, calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>" persistent="false" />
+    <class name="hcal::DigiCollection<hcal::Flavor5, calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>" persistent="false" />
 
     <class name="cms::cuda::Product<hcal::DigiCollection<hcal::Flavor1, calo::common::ViewStoragePolicy>>" persistent="false" />
     <class name="cms::cuda::Product<hcal::DigiCollection<hcal::Flavor3, calo::common::ViewStoragePolicy>>" persistent="false" />
@@ -26,11 +26,11 @@
     <class name="edm::Wrapper<cms::cuda::Product<hcal::DigiCollection<hcal::Flavor3, calo::common::DevStoragePolicy>>>" persistent="false" />
     <class name="edm::Wrapper<cms::cuda::Product<hcal::DigiCollection<hcal::Flavor5, calo::common::DevStoragePolicy>>>" persistent="false" />
 
-    <class name="edm::Wrapper<hcal::DigiCollection<hcal::Flavor1, calo::common::VecStoragePolicy<std::allocator>>>" />
-    <class name="edm::Wrapper<hcal::DigiCollection<hcal::Flavor3, calo::common::VecStoragePolicy<std::allocator>>>" />
-    <class name="edm::Wrapper<hcal::DigiCollection<hcal::Flavor5, calo::common::VecStoragePolicy<std::allocator>>>" />
+    <class name="edm::Wrapper<hcal::DigiCollection<hcal::Flavor1, calo::common::VecStoragePolicy<std::allocator>>>" persistent="false" />
+    <class name="edm::Wrapper<hcal::DigiCollection<hcal::Flavor3, calo::common::VecStoragePolicy<std::allocator>>>" persistent="false" />
+    <class name="edm::Wrapper<hcal::DigiCollection<hcal::Flavor5, calo::common::VecStoragePolicy<std::allocator>>>" persistent="false" />
 
-    <class name="edm::Wrapper<hcal::DigiCollection<hcal::Flavor1, calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>>" />
-    <class name="edm::Wrapper<hcal::DigiCollection<hcal::Flavor3, calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>>" />
-    <class name="edm::Wrapper<hcal::DigiCollection<hcal::Flavor5, calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>>" />
+    <class name="edm::Wrapper<hcal::DigiCollection<hcal::Flavor1, calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>>" persistent="false" />
+    <class name="edm::Wrapper<hcal::DigiCollection<hcal::Flavor3, calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>>" persistent="false" />
+    <class name="edm::Wrapper<hcal::DigiCollection<hcal::Flavor5, calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>>" persistent="false" />
 </lcgdict>

CUDADataFormats/HcalRecHitSoA/src/classes_def.xml

@@ -1,9 +1,9 @@
 <lcgdict>
-    <class name="hcal::RecHitCollection<calo::common::VecStoragePolicy<std::allocator>>"/>
-    <class name="edm::Wrapper<hcal::RecHitCollection<calo::common::VecStoragePolicy<std::allocator>>>"/>
+    <class name="hcal::RecHitCollection<calo::common::VecStoragePolicy<std::allocator>>" persistent="false"/>
+    <class name="edm::Wrapper<hcal::RecHitCollection<calo::common::VecStoragePolicy<std::allocator>>>" persistent="false"/>
 
-    <class name="hcal::RecHitCollection<calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>"/>
-    <class name="edm::Wrapper<hcal::RecHitCollection<calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>>"/>
+    <class name="hcal::RecHitCollection<calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>" persistent="false"/>
+    <class name="edm::Wrapper<hcal::RecHitCollection<calo::common::VecStoragePolicy<calo::common::CUDAHostAllocatorAlias>>>" persistent="false"/>
 
     <class name="cms::cuda::Product<hcal::RecHitCollection<calo::common::ViewStoragePolicy>>" persistent="false" />
     <class name="edm::Wrapper<cms::cuda::Product<hcal::RecHitCollection<calo::common::ViewStoragePolicy>>>" persistent="false" />

CUDADataFormats/StdDictionaries/src/classes_def.xml

@@ -1,14 +1,14 @@
 <lcgdict>
-    <class name="std::vector<std::byte, cms::cuda::HostAllocator<std::byte, 0>>" />
+    <class name="std::vector<std::byte, cms::cuda::HostAllocator<std::byte, 0>>" persistent="false"/>
 
-    <class name="std::vector<uint8_t, cms::cuda::HostAllocator<uint8_t, 0>>" />
-    <class name="std::vector<uint16_t, cms::cuda::HostAllocator<uint16_t, 0>>" />
-    <class name="std::vector<uint32_t, cms::cuda::HostAllocator<uint32_t, 0>>" />
+    <class name="std::vector<uint8_t, cms::cuda::HostAllocator<uint8_t, 0>>" persistent="false"/>
+    <class name="std::vector<uint16_t, cms::cuda::HostAllocator<uint16_t, 0>>" persistent="false"/>
+    <class name="std::vector<uint32_t, cms::cuda::HostAllocator<uint32_t, 0>>" persistent="false"/>
 
-    <class name="std::vector<int8_t, cms::cuda::HostAllocator<int8_t, 0>>" />
-    <class name="std::vector<int16_t, cms::cuda::HostAllocator<int16_t, 0>>" />
-    <class name="std::vector<int32_t, cms::cuda::HostAllocator<int32_t, 0>>" />
+    <class name="std::vector<int8_t, cms::cuda::HostAllocator<int8_t, 0>>" persistent="false"/>
+    <class name="std::vector<int16_t, cms::cuda::HostAllocator<int16_t, 0>>" persistent="false"/>
+    <class name="std::vector<int32_t, cms::cuda::HostAllocator<int32_t, 0>>" persistent="false"/>
 
-    <class name="std::vector<float, cms::cuda::HostAllocator<float, 0>>" />
-    <class name="std::vector<double, cms::cuda::HostAllocator<double, 0>>" />
+    <class name="std::vector<float, cms::cuda::HostAllocator<float, 0>>" persistent="false"/>
+    <class name="std::vector<double, cms::cuda::HostAllocator<double, 0>>" persistent="false"/>
 </lcgdict>

CUDADataFormats/Track/interface/TrackSoAHeterogeneousT.h

@@ -45,6 +45,9 @@ class TrackSoAHeterogeneousT {
 
   eigenSoA::ScalarSoA<int8_t, S> nLayers;
 
+  constexpr int nTracks() const { return nTracks_; }
+  constexpr void setNTracks(int n) { nTracks_ = n; }
+
   constexpr int nHits(int i) const { return detIndices.size(i); }
 
   constexpr bool isTriplet(int i) const { return nLayers(i) == 3; }
@@ -80,6 +83,9 @@ class TrackSoAHeterogeneousT {
 
   HitContainer hitIndices;
   HitContainer detIndices;
+
+private:
+  int nTracks_;
 };
 
 namespace pixelTrack {

CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAnglePCLHarvester.cc

@@ -196,7 +196,7 @@ void SiPixelLorentzAnglePCLHarvester::beginRun(const edm::Run& iRun, const edm::
       continue;
 
     if (std::find(treatedIndices.begin(), treatedIndices.end(), i_index) != treatedIndices.end()) {
-      hists.detIdsList.at(i_index).push_back(rawId);
+      hists.detIdsList[i_index].push_back(rawId);
     } else {
       hists.detIdsList.insert(std::pair<uint32_t, std::vector<uint32_t>>(i_index, {rawId}));
       treatedIndices.push_back(i_index);
@@ -205,7 +205,7 @@ void SiPixelLorentzAnglePCLHarvester::beginRun(const edm::Run& iRun, const edm::
 
   count = 0;
   for (const auto& i : treatedIndices) {
-    for (const auto& id : hists.detIdsList.at(i)) {
+    for (const auto& id : hists.detIdsList[i]) {
       LogDebug("SiPixelLorentzAnglePCLHarvester") << id;
       count++;
     };
@@ -562,6 +562,8 @@ void SiPixelLorentzAnglePCLHarvester::findMean(MonitorElement* h_drift_depth_adc
   }
   hists.h_mean_[i_ring]->setBinContent(i, mean);
   hists.h_mean_[i_ring]->setBinError(i, error);
+
+  h_drift_depth_adc_slice_->Reset();  // clear again after extracting the parameters
 }
 
 //------------------------------------------------------------------------------
@@ -633,6 +635,7 @@ SiPixelLAHarvest::fitResults SiPixelLorentzAnglePCLHarvester::fitAndStore(
   hists.h_bySectMeasLA_->setBinContent(i_index, (res.tan_LA / theMagField));
   hists.h_bySectMeasLA_->setBinError(i_index, (res.error_LA / theMagField));
   hists.h_bySectChi2_->setBinContent(i_index, res.redChi2);
+  hists.h_bySectChi2_->setBinError(i_index, 0.);  // no errors
 
   int nentries = hists.h_bySectOccupancy_->getBinContent(i_index);  // number of on track hits in that sector
 
@@ -643,14 +646,20 @@ SiPixelLAHarvest::fitResults SiPixelLorentzAnglePCLHarvester::fitAndStore(
       << " isNew: " << isNew << " i_index: " << i_index << " shift index: " << shiftIdx;
 
   const auto& detIdsToFill =
-      isNew ? std::vector<unsigned int>({hists.BPixnewDetIds_[shiftIdx]}) : hists.detIdsList.at(i_index);
+      isNew ? std::vector<unsigned int>({hists.BPixnewDetIds_[shiftIdx]}) : hists.detIdsList[i_index];
 
   LogDebug("SiPixelLorentzAnglePCLHarvester")
       << "index: " << i_index << " i_module: " << i_module << " i_layer: " << i_layer;
   for (const auto& id : detIdsToFill) {
     LogDebug("SiPixelLorentzAnglePCLHarvester") << id << ",";
   }
 
+  // no errors on the following MEs
+  hists.h_bySectSetLA_->setBinError(i_index, 0.);
+  hists.h_bySectRejectLA_->setBinError(i_index, 0.);
+  hists.h_bySectLA_->setBinError(i_index, 0.);
+  hists.h_bySectDeltaLA_->setBinError(i_index, 0.);
+
   float LorentzAnglePerTesla_;
   float currentLA = currentLorentzAngle->getLorentzAngle(detIdsToFill.front());
   // if the fit quality is OK
@@ -675,7 +684,6 @@ SiPixelLAHarvest::fitResults SiPixelLorentzAnglePCLHarvester::fitAndStore(
     hists.h_bySectSetLA_->setBinContent(i_index, 0.);
     hists.h_bySectRejectLA_->setBinContent(i_index, (res.tan_LA / theMagField));
     hists.h_bySectLA_->setBinContent(i_index, currentLA);
-
     hists.h_bySectDeltaLA_->setBinContent(i_index, 0.);
 
     for (const auto& id : detIdsToFill) {