L1TCaloLayer1 unpacker modified to provide 5BX TPs to ECAL #32015

asavincms · 2020-11-03T17:34:44Z

PR description:

L1TCaloLayer1 unpacker modified to provide 5BX TPs to ECAL

PR validation:

Checked with data files

if this PR is a backport please specify the original PR and why you need to backport that PR:

Before submitting your pull requests, make sure you followed this checklist:

verify that the PR is really intended for the chosen branch
verify that changes follow CMS Naming, Coding, And Style Rules
verify that the PR passes the basic test procedure suggested in the CMSSW PR instructions

cmsbuild · 2020-11-03T17:36:42Z

The code-checks are being triggered in jenkins.

cmsbuild · 2020-11-03T17:46:14Z

-code-checks

ERROR: Build errors found during clang-tidy run.

CondFormats/DataRecord/interface/L1TGlobalPrescalesVetosFractO2ORcd.h:16:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 315 warnings (314 in non-user code, 1 with check filters).
--
CommonTools/PileupAlgos/src/PuppiContainer.cc:10:10: error: 'fastjet/PseudoJet.hh' file not found [clang-diagnostic-error]
#include "fastjet/PseudoJet.hh"
         ^
Suppressed 490 warnings (489 in non-user code, 1 with check filters).
--
CondCore/DBOutputService/src/OnlineDBOutputService.cc:6:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1378 warnings (1376 in non-user code, 2 with check filters).
--
CondCore/DBOutputService/src/PoolDBOutputService.cc:202:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
CondCore/DBOutputService/src/PoolDBOutputService.cc:230:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
CondCore/DBOutputService/src/PoolDBOutputService.cc:271:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
CondCore/DBOutputService/src/PoolDBOutputService.cc:364:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1396 warnings (1394 in non-user code, 2 with check filters).
--
CondFormats/DataRecord/interface/L1TGlobalPrescalesVetosFractO2ORcd.h:16:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1766 warnings (1764 in non-user code, 2 with check filters).
--
CondTools/L1TriggerExt/plugins/L1TriggerKeyOnlineProdExt.cc:20:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 991 warnings (990 in non-user code, 1 with check filters).
--
CondTools/L1TriggerExt/interface/L1ObjectKeysOnlineProdBaseExt.h:32:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
CondTools/L1TriggerExt/src/L1ObjectKeysOnlineProdBaseExt.cc:8:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1698 warnings (1696 in non-user code, 2 with check filters).
--
CondFormats/DataRecord/interface/L1TGlobalPrescalesVetosFractO2ORcd.h:16:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 2720 warnings (2718 in non-user code, 2 with check filters).
--
DQM/GEM/plugins/GEMDQMStatusDigi.cc:734:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 2197 warnings (2196 in non-user code, 1 with check filters).
--
DQM/BeamMonitor/plugins/FakeBeamMonitor.cc:37:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 2937 warnings (2935 in non-user code, 2 with check filters).
--
DQM/BeamMonitor/plugins/BeamMonitor.h:71:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 3160 warnings (3158 in non-user code, 2 with check filters).
--
DQMOffline/Muon/interface/GEMOfflineDQMBase.h:100:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 2092 warnings (2083 in non-user code, 8 NOLINT, 1 with check filters).
--
DQMOffline/Muon/interface/GEMOfflineDQMBase.h:100:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1701 warnings (1700 in non-user code, 1 with check filters).
--
EventFilter/L1TRawToDigi/plugins/implementations_stage2/BMTFPackerOutput.cc:53:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 908 warnings (907 in non-user code, 1 with check filters).
--
DQMOffline/Muon/interface/GEMOfflineDQMBase.h:100:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1861 warnings (1860 in non-user code, 1 with check filters).
--
EventFilter/GEMRawToDigi/plugins/GEMRawToDigiModule.cc:145:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
EventFilter/GEMRawToDigi/plugins/GEMRawToDigiModule.cc:199:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
EventFilter/GEMRawToDigi/plugins/GEMRawToDigiModule.cc:208:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1533 warnings (1532 in non-user code, 1 with check filters).
--
DQMOffline/Muon/interface/GEMOfflineDQMBase.h:100:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1Trigger/L1TGlobal/interface/L1TGlobalUtil.h:251:27: warning: use std::make_unique instead [modernize-make-unique]
--
Geometry/HGCalCommonData/interface/HGCalTypes.h:62:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalTypes.h:82:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalWaferMask.h:32:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/src/HGCalWaferMask.cc:109:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/src/HGCalWaferMask.cc:289:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/src/HGCalWaferMask.cc:308:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/src/HGCalWaferMask.cc:420:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/src/HGCalWaferMask.cc:439:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/src/HGCalWaferMask.cc:459:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/src/HGCalWaferMask.cc:538:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/src/HGCalWaferMask.cc:583:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/src/HGCalWaferMask.cc:634:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 319 warnings (318 in non-user code, 1 with check filters).
--
Geometry/HGCalCommonData/interface/HGCalParameters.h:174:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalTypes.h:62:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalTypes.h:82:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 487 warnings (486 in non-user code, 1 with check filters).
--
Geometry/CaloTopology/src/HGCalTopology.cc:59:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/CaloTopology/src/HGCalTopology.cc:484:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalParameters.h:174:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalTypes.h:62:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalTypes.h:82:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 501 warnings (500 in non-user code, 1 with check filters).
--
Geometry/HGCalCommonData/interface/HGCalParameters.h:174:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalTypes.h:62:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalTypes.h:82:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalWaferMask.h:32:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/src/HGCalDDDConstants.cc:28:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/src/HGCalDDDConstants.cc:522:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/src/HGCalDDDConstants.cc:1247:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/src/HGCalDDDConstants.cc:1271:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/src/HGCalDDDConstants.cc:1283:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/src/HGCalDDDConstants.cc:1297:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/src/HGCalDDDConstants.cc:1351:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/src/HGCalDDDConstants.cc:1367:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/src/HGCalDDDConstants.cc:1390:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 513 warnings (512 in non-user code, 1 with check filters).
--
Geometry/HGCalCommonData/interface/HGCalParameters.h:174:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 487 warnings (486 in non-user code, 1 with check filters).
--
Geometry/HGCalCommonData/interface/HGCalParameters.h:174:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalTypes.h:62:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalTypes.h:82:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1013 warnings (1012 in non-user code, 1 with check filters).
--
Geometry/HGCalCommonData/interface/HGCalGeomParameters.h:110:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalParameters.h:174:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalTypes.h:62:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalTypes.h:82:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalWaferMask.h:32:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/src/HGCalGeomParameters.cc:172:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/src/HGCalGeomParameters.cc:400:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/src/HGCalGeomParameters.cc:1020:30: error: use of undeclared identifier 'DDVectorGetter' [clang-diagnostic-error]
    waferIndex_ = dbl_to_int(DDVectorGetter::get("WaferIndexEE"));
                             ^
Geometry/HGCalCommonData/src/HGCalGeomParameters.cc:1021:30: error: use of undeclared identifier 'DDVectorGetter' [clang-diagnostic-error]
    waferTypes_ = dbl_to_int(DDVectorGetter::get("WaferTypesEE"));
                             ^
Geometry/HGCalCommonData/src/HGCalGeomParameters.cc:1022:30: error: use of undeclared identifier 'DDVectorGetter' [clang-diagnostic-error]
    waferParts_ = dbl_to_int(DDVectorGetter::get("WaferPartialEE"));
                             ^
Geometry/HGCalCommonData/src/HGCalGeomParameters.cc:1023:30: error: use of undeclared identifier 'DDVectorGetter' [clang-diagnostic-error]
    waferOrien_ = dbl_to_int(DDVectorGetter::get("WaferOrientEE"));
                             ^
Geometry/HGCalCommonData/src/HGCalGeomParameters.cc:1025:30: error: use of undeclared identifier 'DDVectorGetter' [clang-diagnostic-error]
    waferIndex_ = dbl_to_int(DDVectorGetter::get("WaferIndexHE"));
                             ^
Geometry/HGCalCommonData/src/HGCalGeomParameters.cc:1026:30: error: use of undeclared identifier 'DDVectorGetter' [clang-diagnostic-error]
    waferTypes_ = dbl_to_int(DDVectorGetter::get("WaferTypesHE"));
                             ^
Geometry/HGCalCommonData/src/HGCalGeomParameters.cc:1027:30: error: use of undeclared identifier 'DDVectorGetter' [clang-diagnostic-error]
    waferParts_ = dbl_to_int(DDVectorGetter::get("WaferPartialHE"));
                             ^
Geometry/HGCalCommonData/src/HGCalGeomParameters.cc:1028:30: error: use of undeclared identifier 'DDVectorGetter' [clang-diagnostic-error]
    waferOrien_ = dbl_to_int(DDVectorGetter::get("WaferOrientHE"));
                             ^
Geometry/HGCalCommonData/src/HGCalGeomParameters.cc:1110:11: error: no member named 'compareEqual' in namespace 'cms::dd'; did you mean 'dd4hep::dd::compareEqual'? [clang-diagnostic-error]
      if (cms::dd::compareEqual(cms::dd::noNamespace(it.first), "WaferIndexEE")) {
          ^~~~~~~~~~~~~~~~~~~~~
          dd4hep::dd::compareEqual
--
Geometry/HGCalCommonData/src/HGCalGeomParameters.cc:1110:33: error: no member named 'noNamespace' in namespace 'cms::dd'; did you mean 'dd4hep::dd::noNamespace'? [clang-diagnostic-error]
      if (cms::dd::compareEqual(cms::dd::noNamespace(it.first), "WaferIndexEE")) {
                                ^~~~~~~~~~~~~~~~~~~~
                                dd4hep::dd::noNamespace
--
Geometry/HGCalCommonData/src/HGCalGeomParameters.cc:1113:18: error: no member named 'compareEqual' in namespace 'cms::dd'; did you mean 'dd4hep::dd::compareEqual'? [clang-diagnostic-error]
      } else if (cms::dd::compareEqual(cms::dd::noNamespace(it.first), "WaferTypesEE")) {
                 ^~~~~~~~~~~~~~~~~~~~~
                 dd4hep::dd::compareEqual
--
Geometry/HGCalCommonData/src/HGCalGeomParameters.cc:1113:40: error: no member named 'noNamespace' in namespace 'cms::dd'; did you mean 'dd4hep::dd::noNamespace'? [clang-diagnostic-error]
      } else if (cms::dd::compareEqual(cms::dd::noNamespace(it.first), "WaferTypesEE")) {
                                       ^~~~~~~~~~~~~~~~~~~~
                                       dd4hep::dd::noNamespace
--
L1Trigger/CSCTriggerPrimitives/interface/CSCLCTTools.h:4:10: error: 'L1Trigger/CSCCommonTrigger/interface/CSCConstants.h' file not found [clang-diagnostic-error]
#include "L1Trigger/CSCCommonTrigger/interface/CSCConstants.h"
         ^
Suppressed 97 warnings (96 in non-user code, 1 with check filters).
--
Geometry/HGCalCommonData/interface/HGCalGeomParameters.h:110:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalParameters.h:174:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/src/HGCalParametersFromDD.cc:107:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/src/HGCalParametersFromDD.cc:210:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/src/HGCalParametersFromDD.cc:293:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/src/HGCalParametersFromDD.cc:312:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/src/HGCalParametersFromDD.cc:418:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 2354 warnings (2353 in non-user code, 1 with check filters).
--
Geometry/HGCalCommonData/interface/HGCalParameters.h:174:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalTypes.h:62:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalTypes.h:82:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalGeometry/src/HGCalGeometry.cc:231:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 857 warnings (856 in non-user code, 1 with check filters).
--
L1Trigger/CSCTriggerPrimitives/interface/CSCLCTTools.h:4:10: error: 'L1Trigger/CSCCommonTrigger/interface/CSCConstants.h' file not found [clang-diagnostic-error]
#include "L1Trigger/CSCCommonTrigger/interface/CSCConstants.h"
         ^
Suppressed 620 warnings (619 in non-user code, 1 with check filters).
--
L1Trigger/CSCTriggerPrimitives/interface/CSCCathodeLCTProcessor.h:100:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1Trigger/CSCTriggerPrimitives/interface/CSCCathodeLCTProcessor.h:159:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1Trigger/CSCTriggerPrimitives/interface/CSCLCTTools.h:4:10: error: 'L1Trigger/CSCCommonTrigger/interface/CSCConstants.h' file not found [clang-diagnostic-error]
#include "L1Trigger/CSCCommonTrigger/interface/CSCConstants.h"
         ^
Suppressed 662 warnings (661 in non-user code, 1 with check filters).
--
L1Trigger/CSCTriggerPrimitives/interface/CSCCathodeLCTProcessor.h:100:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1Trigger/CSCTriggerPrimitives/interface/CSCCathodeLCTProcessor.h:159:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1Trigger/CSCTriggerPrimitives/interface/CSCLCTTools.h:4:10: error: 'L1Trigger/CSCCommonTrigger/interface/CSCConstants.h' file not found [clang-diagnostic-error]
#include "L1Trigger/CSCCommonTrigger/interface/CSCConstants.h"
         ^
Suppressed 690 warnings (689 in non-user code, 1 with check filters).
--
Geometry/HGCalCommonData/interface/HGCalParameters.h:174:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalTypes.h:62:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalTypes.h:82:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1121 warnings (1120 in non-user code, 1 with check filters).
--
L1Trigger/CSCTriggerPrimitives/interface/CSCCathodeLCTProcessor.h:100:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1Trigger/CSCTriggerPrimitives/interface/CSCCathodeLCTProcessor.h:159:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1Trigger/CSCTriggerPrimitives/src/CSCGEMMotherboardME11.cc:491:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 757 warnings (756 in non-user code, 1 with check filters).
--
L1Trigger/CSCTriggerPrimitives/src/GEMCoPadProcessor.cc:30:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 352 warnings (351 in non-user code, 1 with check filters).
--
L1Trigger/CSCTriggerPrimitives/interface/CSCCathodeLCTProcessor.h:100:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1Trigger/CSCTriggerPrimitives/interface/CSCCathodeLCTProcessor.h:159:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1Trigger/CSCTriggerPrimitives/src/CSCGEMMotherboardME21.cc:228:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1Trigger/CSCTriggerPrimitives/src/CSCGEMMotherboardME21.cc:456:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 751 warnings (750 in non-user code, 1 with check filters).
--
L1Trigger/CSCTriggerPrimitives/interface/CSCCathodeLCTProcessor.h:100:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1Trigger/CSCTriggerPrimitives/interface/CSCCathodeLCTProcessor.h:159:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1Trigger/CSCTriggerPrimitives/interface/CSCLCTTools.h:4:10: error: 'L1Trigger/CSCCommonTrigger/interface/CSCConstants.h' file not found [clang-diagnostic-error]
#include "L1Trigger/CSCCommonTrigger/interface/CSCConstants.h"
         ^
Suppressed 675 warnings (674 in non-user code, 1 with check filters).
--
L1Trigger/CSCTriggerPrimitives/plugins/CSCTriggerPrimitivesProducer.cc:91:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1Trigger/CSCTriggerPrimitives/plugins/CSCTriggerPrimitivesProducer.h:43:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1420 warnings (1419 in non-user code, 1 with check filters).
--
L1Trigger/CSCTriggerPrimitives/interface/CSCCathodeLCTProcessor.h:100:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1Trigger/CSCTriggerPrimitives/interface/CSCCathodeLCTProcessor.h:159:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1Trigger/CSCTriggerPrimitives/src/CSCMotherboardME11.cc:283:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 717 warnings (716 in non-user code, 1 with check filters).
--
L1Trigger/CSCTriggerPrimitives/interface/CSCCathodeLCTProcessor.h:100:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1Trigger/CSCTriggerPrimitives/interface/CSCCathodeLCTProcessor.h:159:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 721 warnings (720 in non-user code, 1 with check filters).
--
L1Trigger/CSCTriggerPrimitives/interface/CSCCathodeLCTProcessor.h:100:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1Trigger/CSCTriggerPrimitives/interface/CSCCathodeLCTProcessor.h:159:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1Trigger/CSCTriggerPrimitives/src/CSCUpgradeMotherboard.cc:269:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 729 warnings (728 in non-user code, 1 with check filters).
--
L1Trigger/CSCTriggerPrimitives/interface/CSCCathodeLCTProcessor.h:100:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1Trigger/CSCTriggerPrimitives/interface/CSCCathodeLCTProcessor.h:159:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 853 warnings (852 in non-user code, 1 with check filters).
--
/cvmfs/cms-ib.cern.ch/nweek-02653/slc7_amd64_gcc820/cms/cmssw-patch/CMSSW_11_2_X_2020-11-02-2300/src/Geometry/CaloGeometry/interface/CaloCellGeometry.h:7:10: error: 'CLHEP/Geometry/Point3D.h' file not found [clang-diagnostic-error]
#include <CLHEP/Geometry/Point3D.h>
         ^
Suppressed 965 warnings (964 in non-user code, 1 with check filters).
--
Geometry/HGCalCommonData/interface/HGCalParameters.h:174:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalTypes.h:62:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalTypes.h:82:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 959 warnings (958 in non-user code, 1 with check filters).
--
Geometry/HGCalCommonData/interface/HGCalParameters.h:174:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalTypes.h:62:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalTypes.h:82:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 910 warnings (909 in non-user code, 1 with check filters).
--
Geometry/HGCalCommonData/interface/HGCalParameters.h:174:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalTypes.h:62:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalTypes.h:82:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 910 warnings (909 in non-user code, 1 with check filters).
--
Geometry/HGCalCommonData/interface/HGCalParameters.h:174:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalTypes.h:62:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalTypes.h:82:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 991 warnings (990 in non-user code, 1 with check filters).
--
Geometry/HGCalCommonData/interface/HGCalParameters.h:174:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalTypes.h:62:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalTypes.h:82:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 911 warnings (910 in non-user code, 1 with check filters).
--
Geometry/HGCalCommonData/interface/HGCalParameters.h:174:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalTypes.h:62:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalTypes.h:82:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1579 warnings (1578 in non-user code, 1 with check filters).
--
Geometry/HGCalCommonData/interface/HGCalParameters.h:174:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalTypes.h:62:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalTypes.h:82:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1398 warnings (1397 in non-user code, 1 with check filters).
--
L1Trigger/Phase2L1ParticleFlow/src/ref/../firmware/data.h:4:10: error: 'ap_int.h' file not found [clang-diagnostic-error]
#include <ap_int.h>
         ^
Suppressed 305 warnings (304 in non-user code, 1 with check filters).
--
/cvmfs/cms-ib.cern.ch/nweek-02653/slc7_amd64_gcc820/cms/cmssw-patch/CMSSW_11_2_X_2020-11-02-2300/src/Geometry/CaloGeometry/interface/CaloCellGeometry.h:7:10: error: 'CLHEP/Geometry/Point3D.h' file not found [clang-diagnostic-error]
#include <CLHEP/Geometry/Point3D.h>
         ^
Suppressed 498 warnings (497 in non-user code, 1 with check filters).
--
DataFormats/L1TrackTrigger/interface/TTTrack.h:16:10: error: 'CLHEP/Units/GlobalPhysicalConstants.h' file not found [clang-diagnostic-error]
#include "CLHEP/Units/GlobalPhysicalConstants.h"
         ^
Suppressed 538 warnings (537 in non-user code, 1 with check filters).
--
DataFormats/L1TrackTrigger/interface/TTTrack.h:16:10: error: 'CLHEP/Units/GlobalPhysicalConstants.h' file not found [clang-diagnostic-error]
#include "CLHEP/Units/GlobalPhysicalConstants.h"
         ^
Suppressed 536 warnings (535 in non-user code, 1 with check filters).
--
DataFormats/L1TrackTrigger/interface/TTTrack.h:16:10: error: 'CLHEP/Units/GlobalPhysicalConstants.h' file not found [clang-diagnostic-error]
#include "CLHEP/Units/GlobalPhysicalConstants.h"
         ^
Suppressed 624 warnings (623 in non-user code, 1 with check filters).
--
L1Trigger/Phase2L1ParticleFlow/plugins/PFClusterProducerFromHGC3DClusters.cc:1:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1Trigger/Phase2L1ParticleFlow/plugins/PFClusterProducerFromHGC3DClusters.cc:76:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1719 warnings (1718 in non-user code, 1 with check filters).
--
DataFormats/L1TrackTrigger/interface/TTTrack.h:16:10: error: 'CLHEP/Units/GlobalPhysicalConstants.h' file not found [clang-diagnostic-error]
#include "CLHEP/Units/GlobalPhysicalConstants.h"
         ^
Suppressed 536 warnings (535 in non-user code, 1 with check filters).
--
DataFormats/L1TrackTrigger/interface/TTTrack.h:16:10: error: 'CLHEP/Units/GlobalPhysicalConstants.h' file not found [clang-diagnostic-error]
#include "CLHEP/Units/GlobalPhysicalConstants.h"
         ^
Suppressed 535 warnings (534 in non-user code, 1 with check filters).
--
L1Trigger/TrackFindingTracklet/interface/Settings.h:32:2: error: USEHYBRID is not defined [clang-diagnostic-error]
#error USEHYBRID is not defined
 ^
Suppressed 544 warnings (543 in non-user code, 1 with check filters).
--
L1Trigger/TrackFindingTracklet/interface/Settings.h:32:2: error: USEHYBRID is not defined [clang-diagnostic-error]
#error USEHYBRID is not defined
 ^
Suppressed 508 warnings (507 in non-user code, 1 with check filters).
--
L1Trigger/TrackFindingTracklet/interface/Settings.h:32:2: error: USEHYBRID is not defined [clang-diagnostic-error]
#error USEHYBRID is not defined
 ^
DataFormats/L1TrackTrigger/interface/TTTrack.h:16:10: error: 'CLHEP/Units/GlobalPhysicalConstants.h' file not found [clang-diagnostic-error]
#include "CLHEP/Units/GlobalPhysicalConstants.h"
         ^
Suppressed Suppressed 439538 warnings ( warnings (438537 in non-user code in non-user code, , 11 with check filters with check filters).
--
L1Trigger/Phase2L1ParticleFlow/plugins/L1TPFProducer.cc:131:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1Trigger/Phase2L1ParticleFlow/plugins/L1TPFProducer.cc:149:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1Trigger/Phase2L1ParticleFlow/plugins/L1TPFProducer.cc:221:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1529 warnings (1528 in non-user code, 1 with check filters).
--
DataFormats/L1TrackTrigger/interface/TTTrack.h:16:10: error: 'CLHEP/Units/GlobalPhysicalConstants.h' file not found [clang-diagnostic-error]
#include "CLHEP/Units/GlobalPhysicalConstants.h"
         ^
Suppressed 528 warnings (527 in non-user code, 1 with check filters).
--
L1Trigger/TrackFindingTracklet/interface/Settings.h:32:2: error: USEHYBRID is not defined [clang-diagnostic-error]
#error USEHYBRID is not defined
 ^
Suppressed 483 warnings (482 in non-user code, 1 with check filters).
--
L1Trigger/TrackFindingTracklet/interface/Settings.h:32:2: error: USEHYBRID is not defined [clang-diagnostic-error]
#error USEHYBRID is not defined
 ^
Suppressed 523 warnings (522 in non-user code, 1 with check filters).
--
DataFormats/L1TrackTrigger/interface/TTTrack.h:16:10: error: 'CLHEP/Units/GlobalPhysicalConstants.h' file not found [clang-diagnostic-error]
#include "CLHEP/Units/GlobalPhysicalConstants.h"
         ^
Suppressed 523 warnings (522 in non-user code, 1 with check filters).
--
L1Trigger/TrackFindingTracklet/interface/Settings.h:32:2: error: USEHYBRID is not defined [clang-diagnostic-error]
#error USEHYBRID is not defined
 ^
Suppressed 447 warnings (446 in non-user code, 1 with check filters).
--
L1Trigger/TrackFindingTracklet/interface/Settings.h:32:2: error: USEHYBRID is not defined [clang-diagnostic-error]
#error USEHYBRID is not defined
 ^
Suppressed 464 warnings (463 in non-user code, 1 with check filters).
--
L1Trigger/TrackFindingTracklet/interface/Settings.h:32:2: error: USEHYBRID is not defined [clang-diagnostic-error]
#error USEHYBRID is not defined
 ^
Suppressed 517 warnings (516 in non-user code, 1 with check filters).
--
L1Trigger/TrackFindingTracklet/interface/Settings.h:32:2: error: USEHYBRID is not defined [clang-diagnostic-error]
#error USEHYBRID is not defined
 ^
Suppressed 484 warnings (483 in non-user code, 1 with check filters).
--
L1Trigger/TrackFindingTracklet/interface/Settings.h:32:2: error: USEHYBRID is not defined [clang-diagnostic-error]
#error USEHYBRID is not defined
 ^
Suppressed 425 warnings (424 in non-user code, 1 with check filters).
--
L1Trigger/TrackFindingTracklet/interface/Settings.h:32:2: error: USEHYBRID is not defined [clang-diagnostic-error]
#error USEHYBRID is not defined
 ^
Suppressed 541 warnings (540 in non-user code, 1 with check filters).
--
L1Trigger/TrackFindingTracklet/interface/Settings.h:32:2: error: USEHYBRID is not defined [clang-diagnostic-error]
#error USEHYBRID is not defined
 ^
Suppressed 492 warnings (491 in non-user code, 1 with check filters).
--
L1Trigger/TrackFindingTracklet/interface/Settings.h:32:2: error: USEHYBRID is not defined [clang-diagnostic-error]
#error USEHYBRID is not defined
 ^
Suppressed 512 warnings (511 in non-user code, 1 with check filters).
--
L1Trigger/TrackFindingTracklet/interface/Settings.h:32:2: error: USEHYBRID is not defined [clang-diagnostic-error]
#error USEHYBRID is not defined
 ^
Suppressed 530 warnings (529 in non-user code, 1 with check filters).
--
L1Trigger/TrackFindingTracklet/interface/Settings.h:32:2: error: USEHYBRID is not defined [clang-diagnostic-error]
#error USEHYBRID is not defined
 ^
Suppressed 495 warnings (494 in non-user code, 1 with check filters).
--
L1Trigger/TrackFindingTracklet/interface/Settings.h:32:2: error: USEHYBRID is not defined [clang-diagnostic-error]
#error USEHYBRID is not defined
 ^
Suppressed 520 warnings (519 in non-user code, 1 with check filters).
--
L1Trigger/TrackFindingTracklet/interface/Settings.h:32:2: error: USEHYBRID is not defined [clang-diagnostic-error]
#error USEHYBRID is not defined
 ^
Suppressed 522 warnings (521 in non-user code, 1 with check filters).
--
L1Trigger/TrackFindingTracklet/interface/Settings.h:32:2: error: USEHYBRID is not defined [clang-diagnostic-error]
#error USEHYBRID is not defined
 ^
Suppressed 521 warnings (520 in non-user code, 1 with check filters).
--
L1Trigger/TrackFindingTracklet/interface/Settings.h:32:2: error: USEHYBRID is not defined [clang-diagnostic-error]
#error USEHYBRID is not defined
 ^
Suppressed 673 warnings (672 in non-user code, 1 with check filters).
--
L1Trigger/TrackerDTC/interface/SetupRcd.h:13:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 318 warnings (317 in non-user code, 1 with check filters).
--
L1TriggerConfig/L1TConfigProducers/src/L1TMuonEndCapForestOnlineProxy.cc:13:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1TriggerConfig/L1TConfigProducers/src/L1TMuonEndCapForestOnlineProxy.cc:26:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1003 warnings (1002 in non-user code, 1 with check filters).
--
L1Trigger/TrackerDTC/interface/SetupRcd.h:13:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1091 warnings (1090 in non-user code, 1 with check filters).
--
L1Trigger/TrackerDTC/interface/SetupRcd.h:13:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1090 warnings (1089 in non-user code, 1 with check filters).
--
L1Trigger/TrackerDTC/interface/SetupRcd.h:13:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1094 warnings (1093 in non-user code, 1 with check filters).
--
L1Trigger/TrackerDTC/interface/SetupRcd.h:13:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1110 warnings (1109 in non-user code, 1 with check filters).
--
L1Trigger/TrackerDTC/interface/SetupRcd.h:13:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1Trigger/TrackerDTC/interface/SetupRcd.h:13:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1Trigger/TrackerDTC/plugins/ProducerES.cc:8:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1Trigger/TrackerDTC/plugins/ProducerES.cc:43:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1Trigger/TrackerDTC/plugins/ProducerES.cc:89:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1358 warnings (1357Suppressed  in non-user code, 1 with check filters).
--
L1Trigger/TrackerDTC/interface/SetupRcd.h:13:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1613 warnings (1612 in non-user code, 1 with check filters).
--
CondTools/L1TriggerExt/interface/L1ObjectKeysOnlineProdBaseExt.h:32:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1641 warnings (1639 in non-user code, 2 with check filters).
--
CondTools/L1TriggerExt/interface/L1ConfigOnlineProdBaseExt.h:96:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1792 warnings (1790 in non-user code, 2 with check filters).
--
CondTools/L1TriggerExt/interface/L1ConfigOnlineProdBaseExt.h:96:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1TriggerConfig/L1TConfigProducers/src/L1TCaloParamsOnlineProd.cc:22:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1TriggerConfig/L1TConfigProducers/src/L1TCaloParamsOnlineProd.cc:219:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 2226 warnings (2224 in non-user code, 2 with check filters).
--
L1TriggerConfig/L1TConfigProducers/src/L1TMuonOverlapParamsOnlineProxy.cc:13:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1TriggerConfig/L1TConfigProducers/src/L1TMuonOverlapParamsOnlineProxy.cc:26:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1009 warnings (1008 in non-user code, 1 with check filters).
--
CondFormats/DataRecord/interface/L1TGlobalPrescalesVetosFractO2ORcd.h:16:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
CondTools/L1TriggerExt/interface/L1ConfigOnlineProdBaseExt.h:96:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 2266 warnings (2264 in non-user code, 2 with check filters).
--
CondTools/L1TriggerExt/interface/L1ConfigOnlineProdBaseExt.h:96:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1TriggerConfig/L1TConfigProducers/src/L1TMuonEndCapParamsOnlineProd.cc:17:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1TriggerConfig/L1TConfigProducers/src/L1TMuonEndCapParamsOnlineProd.cc:34:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 2209 warnings (2207 in non-user code, 2 with check filters).
--
CondTools/L1TriggerExt/interface/L1ConfigOnlineProdBaseExt.h:96:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1TriggerConfig/L1TConfigProducers/src/L1TMuonBarrelParamsOnlineProd.cc:18:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1TriggerConfig/L1TConfigProducers/src/L1TMuonBarrelParamsOnlineProd.cc:35:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 2362 warnings (2360 in non-user code, 2 with check filters).
--
CondTools/L1TriggerExt/interface/L1ConfigOnlineProdBaseExt.h:96:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1TriggerConfig/L1TConfigProducers/src/L1TMuonGlobalParamsOnlineProd.cc:17:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
L1TriggerConfig/L1TConfigProducers/src/L1TMuonGlobalParamsOnlineProd.cc:34:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 2215 warnings (2213 in non-user code, 2 with check filters).
--
CondTools/L1TriggerExt/interface/L1ConfigOnlineProdBaseExt.h:96:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1802 warnings (1800 in non-user code, 2 with check filters).
--
RecoTracker/TkTrackingRegions/interface/TrackingRegion.h:114:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1102 warnings (1101 in non-user code, 1 with check filters).
--
RecoTracker/TkTrackingRegions/interface/GlobalTrackingRegion.h:61:8: error: class member cannot be redeclared [clang-diagnostic-error]
  void checkTracks(reco::TrackCollection const& tracks, std::vector<bool>& mask) const override;
       ^
RecoTracker/TkTrackingRegions/interface/GlobalTrackingRegion.h:48:8: note: previous declaration is here
--
RecoTracker/TkTrackingRegions/interface/TrackingRegion.h:114:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 683 warnings (682 in non-user code, 1 with check filters).
--
CondTools/L1TriggerExt/interface/L1ConfigOnlineProdBaseExt.h:96:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1826 warnings (1824 in non-user code, 2 with check filters).
--
Geometry/HGCalCommonData/interface/HGCalParameters.h:174:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalTypes.h:62:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Geometry/HGCalCommonData/interface/HGCalTypes.h:82:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1639 warnings (1638 in non-user code, 1 with check filters).
--
RecoTracker/TkTrackingRegions/interface/TrackingRegion.h:114:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1348 warnings (1347 in non-user code, 1 with check filters).
--
CondFormats/DataRecord/interface/BeamSpotTransientObjectsRcd.h:30:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 960 warnings (959 in non-user code, 1 with check filters).
--
RecoTracker/TkTrackingRegions/interface/TrackingRegion.h:114:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1131 warnings (1130 in non-user code, 1 with check filters).
--
CondFormats/DataRecord/interface/BeamSpotTransientObjectsRcd.h:30:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1033 warnings (1032 in non-user code, 1 with check filters).
--
RecoTracker/TkSeedGenerator/plugins/SeedGeneratorFromL1TTracksEDProducer.cc:121:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1576 warnings (1575 in non-user code, 1 with check filters).
--
RecoTracker/TkTrackingRegions/interface/TrackingRegion.h:114:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1724 warnings (1723 in non-user code, 1 with check filters).
--
CondFormats/DataRecord/interface/BeamSpotTransientObjectsRcd.h:30:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
Suppressed 1330 warnings (1329 in non-user code, 1 with check filters).
--
gmake: *** [config/SCRAM/GMake/Makefile.coderules:128: code-checks] Error 2
gmake: *** [There are compilation/build errors. Please see the detail log above.] Error 2

boudoul · 2020-11-03T17:50:59Z

Needs to rebase, but presumably a duplicate of this one #32013 ?

asavincms · 2020-11-03T18:38:14Z

Yes it is not completely duplicate one file is different , but I am not sure what happens, I used CMSSW_11_1_X_2020-11-02-2300 On Nov 3, 2020, at 6:51 PM, boudoul <[email protected]<mailto:[email protected]>> wrote: Needs to rebase, but presumably a duplicate of this one #32013<#32013> ? — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub<#32015 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/ABII5ZBCXCNT5GXL4U52YKLSOA7JDANCNFSM4TJBJYSA>.

slava77 · 2020-11-03T18:47:34Z

-1

to take this off our pending list

cmsbuild · 2020-11-03T23:15:36Z

The code-checks are being triggered in jenkins.

cmsbuild · 2020-11-03T23:15:36Z

A new Pull Request was created by @asavincms for CMSSW_11_1_X.

It involves the following packages:

EventFilter/L1TRawToDigi

@cmsbuild, @rekovic, @jmduarte can you please review it and eventually sign? Thanks.
@Martin-Grunewald, @thomreis this is something you requested to watch as well.
@silviodonato, @dpiparo, @qliphy you are the release manager for this.

cms-bot commands are listed here

cmsbuild · 2020-11-03T23:22:24Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-32015/19558

This PR adds an extra 24KB to repository

slava77 · 2020-11-03T23:31:11Z

@cmsbuild please test

cmsbuild · 2020-11-03T23:31:35Z

The tests are being triggered in jenkins.

CMSSW_11_1_X_2020-11-03-1100/slc7_amd64_gcc820: https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/10484/console Started: 2020/11/04 03:32

cmsbuild · 2020-11-04T03:47:50Z

+1
Tested at: a60369b
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-0d3441/10484/summary.html
CMSSW: CMSSW_11_1_X_2020-11-03-1100
SCRAM_ARCH: slc7_amd64_gcc820

cmsbuild · 2020-11-04T03:47:52Z

Comparison job queued.

cmsbuild · 2020-11-04T09:14:03Z

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-0d3441/10484/summary.html

Comparison Summary:

No significant changes to the logs found
Reco comparison results: 4 differences found in the comparisons
DQMHistoTests: Total files compared: 36
DQMHistoTests: Total histograms compared: 2784776
DQMHistoTests: Total failures: 3
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 2784723
DQMHistoTests: Total skipped: 50
DQMHistoTests: Total Missing objects: 0
DQMHistoSizes: Histogram memory added: 0.0 KiB( 35 files compared)
Checked 152 log files, 16 edm output root files, 36 DQM output files

rekovic · 2020-11-04T10:08:03Z

looks fine now

rekovic · 2020-11-04T10:08:11Z

+1

cmsbuild · 2020-11-04T10:08:21Z

This pull request is fully signed and it will be integrated in one of the next CMSSW_11_1_X IBs (tests are also fine) and once validation in the development release cycle CMSSW_11_2_X is complete. This pull request will now be reviewed by the release team before it's merged. @silviodonato, @dpiparo, @qliphy (and backports should be raised in the release meeting by the corresponding L2)

silviodonato · 2020-11-04T11:41:16Z

+1

ECAL wants to have TPs with 5BX, calolayer1 unpacker modified

a60369b

cmsbuild added this to the CMSSW_11_2_X milestone Nov 3, 2020

cmsbuild added code-checks-rejected and removed code-checks-pending labels Nov 3, 2020

cmsbuild removed the reconstruction-pending label Nov 3, 2020

cmsbuild removed operations-pending pdmv-pending reconstruction-rejected simulation-pending upgrade-pending labels Nov 3, 2020

cmsbuild added tests-started and removed tests-pending labels Nov 3, 2020

cmsbuild added tests-approved and removed tests-started labels Nov 4, 2020

cmsbuild added comparison-available and removed comparison-pending labels Nov 4, 2020

cmsbuild added fully-signed l1-approved and removed l1-pending pending-signatures labels Nov 4, 2020

cmsbuild added orp-approved and removed orp-pending labels Nov 4, 2020

cmsbuild merged commit abc83eb into cms-sw:CMSSW_11_1_X Nov 4, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

L1TCaloLayer1 unpacker modified to provide 5BX TPs to ECAL #32015

L1TCaloLayer1 unpacker modified to provide 5BX TPs to ECAL #32015

asavincms commented Nov 3, 2020

cmsbuild commented Nov 3, 2020

cmsbuild commented Nov 3, 2020

boudoul commented Nov 3, 2020

asavincms commented Nov 3, 2020 via email

slava77 commented Nov 3, 2020

cmsbuild commented Nov 3, 2020

cmsbuild commented Nov 3, 2020

cmsbuild commented Nov 3, 2020

slava77 commented Nov 3, 2020

cmsbuild commented Nov 3, 2020 •

edited

Loading

cmsbuild commented Nov 4, 2020

cmsbuild commented Nov 4, 2020

cmsbuild commented Nov 4, 2020

rekovic commented Nov 4, 2020

rekovic commented Nov 4, 2020

cmsbuild commented Nov 4, 2020

silviodonato commented Nov 4, 2020

L1TCaloLayer1 unpacker modified to provide 5BX TPs to ECAL #32015

L1TCaloLayer1 unpacker modified to provide 5BX TPs to ECAL #32015

Conversation

asavincms commented Nov 3, 2020

PR description:

PR validation:

if this PR is a backport please specify the original PR and why you need to backport that PR:

cmsbuild commented Nov 3, 2020

cmsbuild commented Nov 3, 2020

boudoul commented Nov 3, 2020

asavincms commented Nov 3, 2020 via email

slava77 commented Nov 3, 2020

cmsbuild commented Nov 3, 2020

cmsbuild commented Nov 3, 2020

cmsbuild commented Nov 3, 2020

slava77 commented Nov 3, 2020

cmsbuild commented Nov 3, 2020 • edited Loading

cmsbuild commented Nov 4, 2020

cmsbuild commented Nov 4, 2020

cmsbuild commented Nov 4, 2020

rekovic commented Nov 4, 2020

rekovic commented Nov 4, 2020

cmsbuild commented Nov 4, 2020

silviodonato commented Nov 4, 2020

cmsbuild commented Nov 3, 2020 •

edited

Loading