Fixed configuration file error

Author: Jakub-Gajownik

RecoLocalCalo/EcalRecProducers/plugins/BuildFile.xml

@@ -1,4 +1,3 @@
-<use name="CUDADataFormats/EcalRecHitSoA"/>
 <use name="CalibCalorimetry/EcalLaserCorrection"/>
 <use name="CalibCalorimetry/EcalTPGTools"/>
 <use name="CondFormats/DataRecord"/>
@@ -9,8 +8,6 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="Geometry/CaloGeometry"/>
-<use name="HeterogeneousCore/CUDACore"/>
-<use name="HeterogeneousCore/CUDAUtilities"/>
 <use name="RecoLocalCalo/EcalDeadChannelRecoveryAlgos"/>
 <use name="RecoLocalCalo/EcalRecAlgos"/>
 <use name="RecoLocalCalo/EcalRecProducers"/>
@@ -22,8 +19,12 @@
   <set name="cuda_src" value=""/>
 </iftool>
 <library file="*.cc ${cuda_src}" name="RecoLocalCaloEcalRecProducersPlugins">
+  <use name="HeterogeneousCore/CUDACore"/>
+  <use name="HeterogeneousCore/CUDAUtilities"/>
   <flags EDM_PLUGIN="1"/>
 </library>
+
+
 <library file="alpaka/*.cc" name="RecoLocalCaloEcalRecProducersPluginsPortable">
   <use name="alpaka"/>
   <use name="HeterogeneousCore/AlpakaCore"/>

RecoLocalCalo/EcalRecProducers/plugins/EcalUncalibRecHitConvertPortable2CPUFormat.cc

@@ -32,16 +32,21 @@ class EcalUncalibRecHitSoAToLegacy : public edm::global::EDProducer<> {
 void EcalUncalibRecHitSoAToLegacy::fillDescriptions(edm::ConfigurationDescriptions &confDesc) {
   edm::ParameterSetDescription desc;
 
-  desc.add<edm::InputTag>("inputCollectionEB",
-                          edm::InputTag("ecalMultiFitUncalibRecHitPortable", "EcalUncalibRecHitsEB"));
   desc.add<std::string>("outputLabelEB", "EcalUncalibRecHitsEB");
   desc.ifValue(edm::ParameterDescription<bool>("isPhase2", false, true),
                false >> (edm::ParameterDescription<edm::InputTag>(
+			     "inputCollectionEB",
+                             edm::InputTag("ecalMultiFitUncalibRecHitPortable", "EcalUncalibRecHitsEB"),
+                             true) and
+                         edm::ParameterDescription<edm::InputTag>(
                              "inputCollectionEE",
                              edm::InputTag("ecalMultiFitUncalibRecHitPortable", "EcalUncalibRecHitsEE"),
                              true) and
                          edm::ParameterDescription<std::string>("outputLabelEE", "EcalUncalibRecHitsEE", true)) or
-                   true >> edm::EmptyGroupDescription());
+	       true >> (edm::ParameterDescription<edm::InputTag>(
+                               "inputCollectionEB",
+                               edm::InputTag("ecalUncalibRecHitPhase2Portable", "EcalUncalibRecHitsEB"),
+                               true)));
   confDesc.add("ecalUncalibRecHitSoAToLegacy", desc);
 }
 

RecoLocalCalo/EcalRecProducers/plugins/EcalUncalibRecHitSoAToLegacy.cc

@@ -1,23 +1,21 @@
-#alpaka with no switch producer
 import FWCore.ParameterSet.Config as cms
 from Configuration.StandardSequences.Accelerators_cff import *
-from HeterogeneousCore.AlpakaCore.ProcessAcceleratorAlpaka_cfi import ProcessAcceleratorAlpaka
 
 from RecoLocalCalo.EcalRecProducers.ecalPhase2DigiToPortableProducer_cfi import ecalPhase2DigiToPortableProducer as _ecalPhase2DigiToPortableProducer
 ecalPhase2DigiToPortableProducer = _ecalPhase2DigiToPortableProducer.clone()
 
 # portable weights
 from RecoLocalCalo.EcalRecProducers.ecalUncalibRecHitPhase2Portable_cfi import ecalUncalibRecHitPhase2Portable as _ecalUncalibRecHitPhase2Portable
 ecalUncalibRecHitPhase2Portable = _ecalUncalibRecHitPhase2Portable.clone(
-  digisLabelEB = ('ecalPhase2DigiToPortableProducer', 'ebDigis')
+        digisLabelEB = 'ecalPhase2DigiToPortableProducer:ebDigis'
 )
 
-from RecoLocalCalo.EcalRecProducers.ecalUncalibRecHitConvertPortable2CPUFormat_cfi import ecalUncalibRecHitConvertPortable2CPUFormat as _ecalUncalibRecHitConvertPortable2CPUFormat
-ecalUncalibRecHitPhase2 = _ecalUncalibRecHitConvertPortable2CPUFormat.clone(
+from RecoLocalCalo.EcalRecProducers.ecalUncalibRecHitSoAToLegacy_cfi import ecalUncalibRecHitSoAToLegacy as _ecalUncalibRecHitSoAToLegacy
+ecalUncalibRecHitPhase2 = _ecalUncalibRecHitSoAToLegacy.clone(
     isPhase2 = True,
-    uncalibratedRecHitsLabelPortableEB = ('ecalUncalibRecHitPhase2Portable', 'EcalUncalibRecHitsEB'),
-    uncalibratedRecHitsLabelPortableEE = None,
-    uncalibratedRecHitsLabelCPUEE = None
+    uncalibRecHitsPortableEB = 'ecalUncalibRecHitPhase2Portable:EcalUncalibRecHitsEB',
+    uncalibRecHitsPortableEE = None,
+    recHitsLabelCPUEE = None
 )