Skip to content

Commit

Permalink
Merge CMSSW_10_6_X into CMSSW_10_6_DEVEL_X.
Browse files Browse the repository at this point in the history
  • Loading branch information
cmsbuild committed Mar 28, 2019
2 parents 5e92ec0 + 79f244e commit 301b272
Show file tree
Hide file tree
Showing 48 changed files with 74 additions and 83 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include "DataFormats/CSCDigi/interface/CSCWireDigiCollection.h"
#include "DataFormats/CSCDigi/interface/CSCALCTDigi.h"
#include "CondFormats/CSCObjects/interface/CSCDBL1TPParameters.h"
#include "L1Trigger/CSCTriggerPrimitives/src/CSCBaseboard.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCBaseboard.h"

#include <vector>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "Geometry/CSCGeometry/interface/CSCGeometry.h"
#include "L1Trigger/CSCCommonTrigger/interface/CSCConstants.h"
#include "L1Trigger/CSCTriggerPrimitives/src/CSCUpgradeMotherboardLUT.h"
#include "L1Trigger/CSCTriggerPrimitives/src/CSCUpgradeMotherboardLUTGenerator.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCUpgradeMotherboardLUT.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCUpgradeMotherboardLUTGenerator.h"

class CSCBaseboard
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "DataFormats/CSCDigi/interface/CSCCLCTDigi.h"
#include "DataFormats/CSCDigi/interface/CSCCLCTPreTriggerDigi.h"
#include "CondFormats/CSCObjects/interface/CSCDBL1TPParameters.h"
#include "L1Trigger/CSCTriggerPrimitives/src/CSCBaseboard.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCBaseboard.h"

#include <vector>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
*
*/

#include "L1Trigger/CSCTriggerPrimitives/src/CSCUpgradeMotherboard.h"
#include "L1Trigger/CSCTriggerPrimitives/src/GEMCoPadProcessor.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCUpgradeMotherboard.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/GEMCoPadProcessor.h"
#include "Geometry/GEMGeometry/interface/GEMGeometry.h"
#include "DataFormats/GEMDigi/interface/GEMPadDigiCollection.h"
#include "DataFormats/GEMDigi/interface/GEMCoPadDigiCollection.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*
*/

#include "L1Trigger/CSCTriggerPrimitives/src/CSCGEMMotherboard.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCGEMMotherboard.h"

class CSCGEMMotherboardME11 : public CSCGEMMotherboard
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*
*/

#include "L1Trigger/CSCTriggerPrimitives/src/CSCGEMMotherboard.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCGEMMotherboard.h"

class CSCGEMMotherboardME21 : public CSCGEMMotherboard
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
*
*/

#include "L1Trigger/CSCTriggerPrimitives/src/CSCAnodeLCTProcessor.h"
#include "L1Trigger/CSCTriggerPrimitives/src/CSCCathodeLCTProcessor.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCAnodeLCTProcessor.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCCathodeLCTProcessor.h"
#include "DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigi.h"
#include "L1Trigger/CSCTriggerPrimitives/src/CSCBaseboard.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCBaseboard.h"

class CSCMotherboard : public CSCBaseboard
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*
*/

#include "L1Trigger/CSCTriggerPrimitives/src/CSCUpgradeMotherboard.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCUpgradeMotherboard.h"

class CSCMotherboardME11 : public CSCUpgradeMotherboard
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Updates for high pileup running by Vadim Khotilovich (TAMU), December 2012
*/

#include "L1Trigger/CSCTriggerPrimitives/src/CSCAnodeLCTProcessor.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCAnodeLCTProcessor.h"

class CSCUpgradeAnodeLCTProcessor : public CSCAnodeLCTProcessor
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* Removing usage of outdated class CSCTriggerGeometry by Sven Dildick (TAMU)
*/

#include "L1Trigger/CSCTriggerPrimitives/src/CSCCathodeLCTProcessor.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCCathodeLCTProcessor.h"

#include <vector>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
*
*/

#include "L1Trigger/CSCTriggerPrimitives/src/CSCMotherboard.h"
#include "L1Trigger/CSCTriggerPrimitives/src/CSCUpgradeAnodeLCTProcessor.h"
#include "L1Trigger/CSCTriggerPrimitives/src/CSCUpgradeCathodeLCTProcessor.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCMotherboard.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCUpgradeAnodeLCTProcessor.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCUpgradeCathodeLCTProcessor.h"

// generic container type
namespace{
Expand Down
16 changes: 15 additions & 1 deletion L1Trigger/CSCTriggerPrimitives/plugins/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
<use name="L1Trigger/CSCTriggerPrimitives"/>
<use name="CondFormats/DataRecord"/>
<use name="Geometry/Records"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/CSCDigi"/>
<use name="FWCore/Framework"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/Utilities"/>
<use name="Geometry/CSCGeometry"/>
<use name="L1Trigger/CSCCommonTrigger"/>
<use name="L1Trigger/CSCTriggerPrimitives"/>
<use name="SimDataFormats/TrackingHit"/>
<use name="SimDataFormats/GeneratorProducts"/>
<use name="CommonTools/Utils"/>
<use name="CommonTools/UtilAlgos"/>
<use name="rootgraphics"/>

<library file="*.cc" name="CSCTriggerPrimitivesPlugins">
<flags EDM_PLUGIN="1"/>
</library>
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
#include "Geometry/CSCGeometry/interface/CSCLayer.h"

#include "L1Trigger/CSCCommonTrigger/interface/CSCConstants.h"
#include "L1Trigger/CSCTriggerPrimitives/src/CSCAnodeLCTProcessor.h"
#include "L1Trigger/CSCTriggerPrimitives/test/CSCAnodeLCTAnalyzer.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCAnodeLCTProcessor.h"
#include "L1Trigger/CSCTriggerPrimitives/plugins/CSCAnodeLCTAnalyzer.h"

using namespace std;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
*
*/

#ifndef CSCTriggerPrimitives_CSCAnodeLCTAnalyzer_H
#define CSCTriggerPrimitives_CSCAnodeLCTAnalyzer_H
#ifndef L1Trigger_CSCTriggerPrimitives_CSCAnodeLCTAnalyzer_H
#define L1Trigger_CSCTriggerPrimitives_CSCAnodeLCTAnalyzer_H

#include "DataFormats/CSCDigi/interface/CSCWireDigiCollection.h"
#include "DataFormats/CSCDigi/interface/CSCALCTDigiCollection.h"
#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
#include "L1Trigger/CSCTriggerPrimitives/test/CSCLayerInfo.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCLayerInfo.h"

typedef CSCLayerInfo<CSCWireDigi> CSCAnodeLayerInfo;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
#include "Geometry/CSCGeometry/interface/OffsetRadialStripTopology.h"

#include "L1Trigger/CSCCommonTrigger/interface/CSCConstants.h"
#include "L1Trigger/CSCTriggerPrimitives/src/CSCCathodeLCTProcessor.h"
#include "L1Trigger/CSCTriggerPrimitives/test/CSCCathodeLCTAnalyzer.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCCathodeLCTProcessor.h"
#include "L1Trigger/CSCTriggerPrimitives/plugins/CSCCathodeLCTAnalyzer.h"

using namespace std;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
*
*/

#ifndef CSCTriggerPrimitives_CSCCathodeLCTAnalyzer_H
#define CSCTriggerPrimitives_CSCCathodeLCTAnalyzer_H
#ifndef L1Trigger_CSCTriggerPrimitives_CSCCathodeLCTAnalyzer_H
#define L1Trigger_CSCTriggerPrimitives_CSCCathodeLCTAnalyzer_H

#include "DataFormats/CSCDigi/interface/CSCComparatorDigiCollection.h"
#include "DataFormats/CSCDigi/interface/CSCCLCTDigiCollection.h"
#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
#include "L1Trigger/CSCTriggerPrimitives/test/CSCLayerInfo.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCLayerInfo.h"

typedef CSCLayerInfo<CSCComparatorDigi> CSCCathodeLayerInfo;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
//--------------------------------------------------

#include "L1Trigger/CSCTriggerPrimitives/plugins/CSCTriggerPrimitivesProducer.h"
#include "L1Trigger/CSCTriggerPrimitives/src/CSCTriggerPrimitivesBuilder.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCTriggerPrimitivesBuilder.h"

#include "DataFormats/Common/interface/Handle.h"
#include "FWCore/Framework/interface/ESHandle.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#include "DataFormats/CSCDigi/interface/CSCWireDigiCollection.h"
#include "DataFormats/GEMDigi/interface/GEMPadDigiCollection.h"
#include "DataFormats/GEMDigi/interface/GEMPadDigiClusterCollection.h"
#include "L1Trigger/CSCTriggerPrimitives/src/CSCTriggerPrimitivesBuilder.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCTriggerPrimitivesBuilder.h"

class CSCTriggerPrimitivesProducer : public edm::global::EDProducer<edm::StreamCache<CSCTriggerPrimitivesBuilder>>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
//-----------------------
// This Class's Header --
//-----------------------
#include "CSCTriggerPrimitivesReader.h"
#include "L1Trigger/CSCTriggerPrimitives/plugins/CSCTriggerPrimitivesReader.h"

//-------------------------------
// Collaborating Class Headers --
Expand All @@ -36,8 +36,8 @@
#include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"

// MC tests
#include "L1Trigger/CSCTriggerPrimitives/test/CSCAnodeLCTAnalyzer.h"
#include "L1Trigger/CSCTriggerPrimitives/test/CSCCathodeLCTAnalyzer.h"
#include "L1Trigger/CSCTriggerPrimitives/plugins/CSCAnodeLCTAnalyzer.h"
#include "L1Trigger/CSCTriggerPrimitives/plugins/CSCCathodeLCTAnalyzer.h"
#include "Geometry/CSCGeometry/interface/CSCLayer.h"
#include "Geometry/CSCGeometry/interface/CSCGeometry.h"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef CSCTriggerPrimitives_CSCTriggerPrimitivesReader_h
#define CSCTriggerPrimitives_CSCTriggerPrimitivesReader_h
#ifndef L1Trigger_CSCTriggerPrimitives_CSCTriggerPrimitivesReader_h
#define L1Trigger_CSCTriggerPrimitives_CSCTriggerPrimitivesReader_h

/** \class CSCTriggerPrimitivesReader
*
Expand Down Expand Up @@ -28,7 +28,7 @@
#include "DataFormats/CSCDigi/interface/CSCWireDigiCollection.h"
#include "DataFormats/CSCDigi/interface/CSCComparatorDigiCollection.h"

#include "L1Trigger/CSCTriggerPrimitives/src/CSCCathodeLCTProcessor.h" // TMB07
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCCathodeLCTProcessor.h" // TMB07

#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# =====================================================
lctreader = cms.EDAnalyzer("CSCTriggerPrimitivesReader",
# Parameters common for all boards
commonParam = cscTriggerPrimitiveDigis.commonParam
commonParam = cscTriggerPrimitiveDigis.commonParam,
# Switch on/off the verbosity and turn on/off histogram production
debug = cms.untracked.bool(False),
# Define which LCTs are present in the input file. This will determine the
Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/CSCTriggerPrimitives/src/CSCAnodeLCTProcessor.cc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "L1Trigger/CSCTriggerPrimitives/src/CSCAnodeLCTProcessor.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCAnodeLCTProcessor.h"
#include <set>

//-----------------
Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/CSCTriggerPrimitives/src/CSCBaseboard.cc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "L1Trigger/CSCTriggerPrimitives/src/CSCBaseboard.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCBaseboard.h"

CSCBaseboard::CSCBaseboard(unsigned endcap, unsigned station,
unsigned sector, unsigned subsector,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "L1Trigger/CSCTriggerPrimitives/src/CSCCathodeLCTProcessor.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCCathodeLCTProcessor.h"

#include <iomanip>
#include <iostream>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "L1Trigger/CSCTriggerPrimitives/src/CSCComparatorDigiFitter.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCComparatorDigiFitter.h"
#include "L1Trigger/CSCCommonTrigger/interface/CSCConstants.h"
#include "DataFormats/Math/interface/normalizedPhi.h"

Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/CSCTriggerPrimitives/src/CSCGEMMotherboard.cc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "L1Trigger/CSCTriggerPrimitives/src/CSCGEMMotherboard.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCGEMMotherboard.h"

CSCGEMMotherboard::CSCGEMMotherboard(unsigned endcap, unsigned station,
unsigned sector, unsigned subsector,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "L1Trigger/CSCTriggerPrimitives/src/CSCGEMMotherboardME11.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCGEMMotherboardME11.h"

CSCGEMMotherboardME11::CSCGEMMotherboardME11(unsigned endcap, unsigned station,
unsigned sector, unsigned subsector,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "L1Trigger/CSCTriggerPrimitives/src/CSCGEMMotherboardME21.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCGEMMotherboardME21.h"

CSCGEMMotherboardME21::CSCGEMMotherboardME21(unsigned endcap, unsigned station,
unsigned sector, unsigned subsector,
Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/CSCTriggerPrimitives/src/CSCMotherboard.cc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "L1Trigger/CSCTriggerPrimitives/src/CSCMotherboard.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCMotherboard.h"
#include <iostream>

// Default values of configuration parameters.
Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/CSCTriggerPrimitives/src/CSCMotherboardME11.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//-----------------------------------------------------------------------------

#include "L1Trigger/CSCTriggerPrimitives/src/CSCMotherboardME11.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCMotherboardME11.h"

CSCMotherboardME11::CSCMotherboardME11(unsigned endcap, unsigned station,
unsigned sector, unsigned subsector,
Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/CSCTriggerPrimitives/src/CSCMuonPortCard.cc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "L1Trigger/CSCTriggerPrimitives/src/CSCMuonPortCard.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCMuonPortCard.h"
#include "L1Trigger/CSCCommonTrigger/interface/CSCConstants.h"
#include <algorithm>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include "L1Trigger/CSCTriggerPrimitives/src/CSCTriggerPrimitivesBuilder.h"
#include "L1Trigger/CSCTriggerPrimitives/src/CSCMotherboard.h"
#include "L1Trigger/CSCTriggerPrimitives/src/CSCMotherboardME11.h"
#include "L1Trigger/CSCTriggerPrimitives/src/CSCGEMMotherboardME11.h"
#include "L1Trigger/CSCTriggerPrimitives/src/CSCGEMMotherboardME21.h"
#include "L1Trigger/CSCTriggerPrimitives/src/CSCMuonPortCard.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCTriggerPrimitivesBuilder.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCMotherboard.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCMotherboardME11.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCGEMMotherboardME11.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCGEMMotherboardME21.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCMuonPortCard.h"
#include "Geometry/GEMGeometry/interface/GEMGeometry.h"

const int CSCTriggerPrimitivesBuilder::min_endcap = CSCDetId::minEndcapId();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "L1Trigger/CSCTriggerPrimitives/src/CSCUpgradeAnodeLCTProcessor.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCUpgradeAnodeLCTProcessor.h"

CSCUpgradeAnodeLCTProcessor::CSCUpgradeAnodeLCTProcessor(unsigned endcap, unsigned station,
unsigned sector, unsigned subsector,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "L1Trigger/CSCTriggerPrimitives/src/CSCUpgradeCathodeLCTProcessor.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCUpgradeCathodeLCTProcessor.h"

#include <iomanip>
#include <iostream>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "L1Trigger/CSCTriggerPrimitives/src/CSCUpgradeMotherboard.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCUpgradeMotherboard.h"

CSCUpgradeMotherboard::LCTContainer::LCTContainer(unsigned int trig_window_size)
: match_trig_window_size_(trig_window_size)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "L1Trigger/CSCTriggerPrimitives/src/CSCUpgradeMotherboardLUT.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCUpgradeMotherboardLUT.h"

CSCMotherboardLUTME11::CSCMotherboardLUTME11()
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "L1Trigger/CSCTriggerPrimitives/src/CSCUpgradeMotherboardLUTGenerator.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/CSCUpgradeMotherboardLUTGenerator.h"
#include "Geometry/GEMGeometry/interface/GEMEtaPartitionSpecs.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"

Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/CSCTriggerPrimitives/src/GEMCoPadProcessor.cc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "L1Trigger/CSCTriggerPrimitives/src/GEMCoPadProcessor.h"
#include "L1Trigger/CSCTriggerPrimitives/interface/GEMCoPadProcessor.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"

#include <algorithm>
Expand Down
23 changes: 0 additions & 23 deletions L1Trigger/CSCTriggerPrimitives/test/BuildFile.xml

This file was deleted.

Loading

0 comments on commit 301b272

Please sign in to comment.