Skip to content

Commit

Permalink
Merge pull request #5089 from degrutto/new-CSCTF_250714_72X_2014-08-2…
Browse files Browse the repository at this point in the history 
…8-0200

L1Trigger/CSCTrackFinder -- adapt new-CSCTF_250714 (62X_SLHC) to 72X
  • Loading branch information
@nclopezo
nclopezo committed Aug 29, 2014
2 parents f9a8555 + 30e5ab6 commit e71a186
Show file tree
Hide file tree
Showing 58 changed files with 245,776 additions and 1,157 deletions.
1,024 changes: 1,024 additions & 0 deletions L1Trigger/CSCTrackFinder/data/core_2014_04_24/comp_dphi_4b.dat
View file

Large diffs are not rendered by default.

1,024 changes: 1,024 additions & 0 deletions L1Trigger/CSCTrackFinder/data/core_2014_04_24/comp_dphi_5.dat
View file

Large diffs are not rendered by default.

1,024 changes: 1,024 additions & 0 deletions L1Trigger/CSCTrackFinder/data/core_2014_04_24/comp_dphi_7.dat
View file

Large diffs are not rendered by default.

1,024 changes: 1,024 additions & 0 deletions L1Trigger/CSCTrackFinder/data/core_2014_04_24/comp_dphi_8.dat
View file

Large diffs are not rendered by default.

1,024 changes: 1,024 additions & 0 deletions L1Trigger/CSCTrackFinder/data/core_2014_04_24/comp_dphi_8a.dat
View file

Large diffs are not rendered by default.

1,024 changes: 1,024 additions & 0 deletions L1Trigger/CSCTrackFinder/data/core_2014_05_15/comp_dphi_4b.dat
View file

Large diffs are not rendered by default.

1,024 changes: 1,024 additions & 0 deletions L1Trigger/CSCTrackFinder/data/core_2014_05_15/comp_dphi_5.dat
View file

Large diffs are not rendered by default.

1,024 changes: 1,024 additions & 0 deletions L1Trigger/CSCTrackFinder/data/core_2014_05_15/comp_dphi_7.dat
View file

Large diffs are not rendered by default.

1,024 changes: 1,024 additions & 0 deletions L1Trigger/CSCTrackFinder/data/core_2014_05_15/comp_dphi_8.dat
View file

Large diffs are not rendered by default.

1,024 changes: 1,024 additions & 0 deletions L1Trigger/CSCTrackFinder/data/core_2014_05_15/comp_dphi_8a.dat
View file

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions L1Trigger/CSCTrackFinder/interface/CSCSectorReceiverLUT.h
View file
Expand Up @@ -29,21 +29,21 @@ class CSCSectorReceiverLUT

/// Please note, the pattern used below is the 4 bit pattern.
/// ex) digi->getPattern(), NOT digi->getCLCTPattern()
lclphidat localPhi(int strip, int pattern, int quality, int lr) const;
lclphidat localPhi(unsigned address) const;
lclphidat localPhi(lclphiadd address) const;
lclphidat localPhi(int strip, int pattern, int quality, int lr, const bool gangedME1a = false ) const;
lclphidat localPhi(unsigned address, const bool gangedME1a = false ) const;
lclphidat localPhi(lclphiadd address, const bool gangedME1a = false ) const;

gblphidat globalPhiME(int phi_local, int wire_group, int cscid) const;
gblphidat globalPhiME(unsigned address) const;
gblphidat globalPhiME(gblphiadd address) const;
gblphidat globalPhiME(int phi_local, int wire_group, int cscid, const bool gangedME1a = false) const;
gblphidat globalPhiME(unsigned address, const bool gangedME1a = false) const;
gblphidat globalPhiME(gblphiadd address, const bool gangedME1a = false ) const;

gblphidat globalPhiMB(int phi_local,int wire_group, int cscid) const;
gblphidat globalPhiMB(unsigned address) const;
gblphidat globalPhiMB(gblphiadd address) const;
gblphidat globalPhiMB(int phi_local,int wire_group, int cscid, const bool gangedME1a = false) const;
gblphidat globalPhiMB(unsigned address, const bool gangedME1a = false) const;
gblphidat globalPhiMB(gblphiadd address, const bool gangedME1a = false) const;

gbletadat globalEtaME(int phi_bend, int phi_local, int wire_group, int cscid) const;
gbletadat globalEtaME(unsigned address) const;
gbletadat globalEtaME(gbletaadd address) const;
gbletadat globalEtaME(int phi_bend, int phi_local, int wire_group, int cscid, const bool gangedME1a = false) const;
gbletadat globalEtaME(unsigned address, const bool gangedME1a = false) const;
gbletadat globalEtaME(gbletaadd address, const bool gangedME1a = false) const;

/// Helpers
std::string encodeFileIndex() const;
Expand Down
8 changes: 4 additions & 4 deletions L1Trigger/CSCTrackFinder/interface/CSCSectorReceiverMiniLUT.h
View file
Expand Up @@ -15,10 +15,10 @@
class CSCSectorReceiverMiniLUT
{
public:
static lclphidat calcLocalPhiMini(unsigned theadd);
static global_eta_data calcGlobalEtaMEMini(unsigned short endcap, unsigned short sector, unsigned short station, unsigned short subsector, unsigned theadd);
static global_phi_data calcGlobalPhiMEMini(unsigned short endcap, unsigned short sector, unsigned short station, unsigned short subsector, unsigned theadd);
static global_phi_data calcGlobalPhiMBMini(unsigned short endcap, unsigned short sector, unsigned short subsector, unsigned theadd);
static lclphidat calcLocalPhiMini(unsigned theadd, const bool gangedME1a);
static global_eta_data calcGlobalEtaMEMini(unsigned short endcap, unsigned short sector, unsigned short station, unsigned short subsector, unsigned theadd, const bool gangedME1a);
static global_phi_data calcGlobalPhiMEMini(unsigned short endcap, unsigned short sector, unsigned short station, unsigned short subsector, unsigned theadd, const bool gangedME1a);
static global_phi_data calcGlobalPhiMBMini(unsigned short endcap, unsigned short sector, unsigned short subsector, unsigned theadd, const bool gangedME1a);

private:
static const float lcl_phi_param0[1<<4];
Expand Down
132 changes: 66 additions & 66 deletions L1Trigger/CSCTrackFinder/interface/CSCTFPtMethods.h
View file
Expand Up @@ -36,72 +36,72 @@ class CSCTFPtMethods
static const float FRCorrHighEta[kME2andMB2][2];

/** parameters for Anna's method 2011*/
static const double AB_mu12FnoME11[4][15];
static const double AB_mu13FnoME11[4][15];
static const double AB_mu14FnoME11[4][15];
static const double AB_mu12RnoME11[4][15];
static const double AB_mu13RnoME11[4][15];
static const double AB_mu14RnoME11[4][15];
static const double AB_mu12FME11[4][15];
static const double AB_mu13FME11[4][15];
static const double AB_mu14FME11[4][15];
static const double AB_mu12RME11[4][15];
static const double AB_mu13RME11[4][15];
static const double AB_mu14RME11[4][15];
static const double AB_sig12FnoME11[4][15];
static const double AB_sig13FnoME11[4][15];
static const double AB_sig14FnoME11[4][15];
static const double AB_sig12RnoME11[4][15];
static const double AB_sig13RnoME11[4][15];
static const double AB_sig14RnoME11[4][15];
static const double AB_sig12FME11[4][15];
static const double AB_sig13FME11[4][15];
static const double AB_sig14FME11[4][15];
static const double AB_sig12RME11[4][15];
static const double AB_sig13RME11[4][15];
static const double AB_sig14RME11[4][15];

static const double AB_mu12F[4][15];
static const double AB_mu13F[4][15];
static const double AB_mu14F[4][15];
static const double AB_mu12R[4][15];
static const double AB_mu13R[4][15];
static const double AB_mu14R[4][15];
static const double AB_mu23[4][15];
static const double AB_mu24[4][15];
static const double AB_mu34[4][15];
static const double AB_mu51[4][15];
static const double AB_mu52[4][15];
static const double AB_mu53[4][15];
static const double AB_mu5[4][15];

static const double AB_sig12F[4][15];
static const double AB_sig13F[4][15];
static const double AB_sig14F[4][15];
static const double AB_sig12R[4][15];
static const double AB_sig13R[4][15];
static const double AB_sig14R[4][15];
static const double AB_sig23[4][15];
static const double AB_sig24[4][15];
static const double AB_sig34[4][15];
static const double AB_sig51[4][15];
static const double AB_sig52[4][15];
static const double AB_sig53[4][15];
static const double AB_sig5[4][15];

static const double AB_rho123F[5][15];
static const double AB_rho124F[5][15];
static const double AB_rho134F[5][15];
static const double AB_rho123R[5][15];
static const double AB_rho124R[5][15];
static const double AB_rho134R[5][15];
static const double AB_rho234[5][15];
static const double AB_rho512[5][15];
static const double AB_rho513[5][15];
static const double AB_rho523[5][15];
static const double AB_rho51B[5][15];
static const double AB_rho52B[5][15];
static const double AB_rho53B[5][15];
static double AB_mu12FnoME11[4][15];
static double AB_mu13FnoME11[4][15];
static double AB_mu14FnoME11[4][15];
static double AB_mu12RnoME11[4][15];
static double AB_mu13RnoME11[4][15];
static double AB_mu14RnoME11[4][15];
static double AB_mu12FME11[4][15];
static double AB_mu13FME11[4][15];
static double AB_mu14FME11[4][15];
static double AB_mu12RME11[4][15];
static double AB_mu13RME11[4][15];
static double AB_mu14RME11[4][15];
static double AB_sig12FnoME11[4][15];
static double AB_sig13FnoME11[4][15];
static double AB_sig14FnoME11[4][15];
static double AB_sig12RnoME11[4][15];
static double AB_sig13RnoME11[4][15];
static double AB_sig14RnoME11[4][15];
static double AB_sig12FME11[4][15];
static double AB_sig13FME11[4][15];
static double AB_sig14FME11[4][15];
static double AB_sig12RME11[4][15];
static double AB_sig13RME11[4][15];
static double AB_sig14RME11[4][15];

static double AB_mu12F[4][15];
static double AB_mu13F[4][15];
static double AB_mu14F[4][15];
static double AB_mu12R[4][15];
static double AB_mu13R[4][15];
static double AB_mu14R[4][15];
static double AB_mu23[4][15];
static double AB_mu24[4][15];
static double AB_mu34[4][15];
static double AB_mu51[4][15];
static double AB_mu52[4][15];
static double AB_mu53[4][15];
static double AB_mu5[4][15];

static double AB_sig12F[4][15];
static double AB_sig13F[4][15];
static double AB_sig14F[4][15];
static double AB_sig12R[4][15];
static double AB_sig13R[4][15];
static double AB_sig14R[4][15];
static double AB_sig23[4][15];
static double AB_sig24[4][15];
static double AB_sig34[4][15];
static double AB_sig51[4][15];
static double AB_sig52[4][15];
static double AB_sig53[4][15];
static double AB_sig5[4][15];

static double AB_rho123F[5][15];
static double AB_rho124F[5][15];
static double AB_rho134F[5][15];
static double AB_rho123R[5][15];
static double AB_rho124R[5][15];
static double AB_rho134R[5][15];
static double AB_rho234[5][15];
static double AB_rho512[5][15];
static double AB_rho513[5][15];
static double AB_rho523[5][15];
static double AB_rho51B[5][15];
static double AB_rho52B[5][15];
static double AB_rho53B[5][15];
/** parameters for Anna's method 2010*/
static const double A_mu12Front[4][15];
static const double A_sig12Front[3][15];
Expand Down
10 changes: 8 additions & 2 deletions L1Trigger/CSCTrackFinder/interface/CSCTFSPCoreLogic.h
View file
Expand Up @@ -16,6 +16,8 @@
#include <L1Trigger/CSCTrackFinder/src/core_2012_01_31/vpp_generated.h>
#include <L1Trigger/CSCTrackFinder/src/core_2012_03_13/vpp_generated.h>
#include <L1Trigger/CSCTrackFinder/src/core_2012_07_30/vpp_generated.h>
#include <L1Trigger/CSCTrackFinder/src/core_2014_04_24/vpp_generated.h>
#include <L1Trigger/CSCTrackFinder/src/core_2014_05_15/vpp_generated.h>

class vpp_generated_2010_01_22;
class vpp_generated_2010_07_28;
Expand All @@ -26,6 +28,8 @@ class vpp_generated_2011_01_18;
class vpp_generated_2012_01_31;
class vpp_generated_2012_03_13;
class vpp_generated_2012_07_30;
class vpp_generated_2014_04_24;
class vpp_generated_2014_05_15;

class CSCTFSPCoreLogic
{
Expand Down Expand Up @@ -78,7 +82,7 @@ class CSCTFSPCoreLogic

void loadData(const CSCTriggerContainer<csctf::TrackStub>&,
const unsigned& endcap, const unsigned& sector,
const int& minBX, const int& maxBX);
const int& minBX, const int& maxBX, const bool gangedME1a);

bool run(const unsigned& endcap, const unsigned& sector, const unsigned& latency,
const unsigned& etamin1, const unsigned& etamin2, const unsigned& etamin3, const unsigned& etamin4,
Expand Down Expand Up @@ -126,7 +130,9 @@ class CSCTFSPCoreLogic
static vpp_generated_2012_01_31 sp_2012_01_31_;
static vpp_generated_2012_03_13 sp_2012_03_13_;
static vpp_generated_2012_07_30 sp_2012_07_30_;

static vpp_generated_2014_04_24 sp_2014_04_24_;
static vpp_generated_2014_05_15 sp_2014_05_15_;

std::vector<SPio> io_;
bool runme;
CSCTriggerContainer<csc::L1Track> mytracks;
Expand Down
1 change: 0 additions & 1 deletion L1Trigger/CSCTrackFinder/plugins/CSCTFCandidateProducer.cc
View file
Expand Up @@ -14,7 +14,6 @@ CSCTFCandidateProducer::CSCTFCandidateProducer(const edm::ParameterSet& pset)
my_builder = new CSCTFCandidateBuilder(mu_sorter_pset);
input_module = pset.getUntrackedParameter<edm::InputTag>("CSCTrackProducer");
produces<std::vector<L1MuRegionalCand> >("CSC");
consumes<L1CSCTrackCollection>(input_module);
}

CSCTFCandidateProducer::~CSCTFCandidateProducer()
Expand Down
4 changes: 0 additions & 4 deletions L1Trigger/CSCTrackFinder/plugins/CSCTFTrackProducer.cc
View file
Expand Up @@ -37,10 +37,6 @@ CSCTFTrackProducer::CSCTFTrackProducer(const edm::ParameterSet& pset)
my_builder = 0 ;
produces<L1CSCTrackCollection>();
produces<CSCTriggerContainer<csctf::TrackStub> >();
usesResource("CSCTFTrackProducer");
consumes<CSCCorrelatedLCTDigiCollection>(input_module);
consumes<L1MuDTChambPhContainer>(dt_producer);
consumes<CSCTriggerContainer<csctf::TrackStub> >(directProd);
}

CSCTFTrackProducer::~CSCTFTrackProducer()
Expand Down
6 changes: 3 additions & 3 deletions L1Trigger/CSCTrackFinder/plugins/CSCTFTrackProducer.h
View file
Expand Up @@ -3,20 +3,20 @@

#include <string>

#include <FWCore/Framework/interface/one/EDProducer.h>
#include <FWCore/Framework/interface/EDProducer.h>
#include <FWCore/ParameterSet/interface/ParameterSet.h>
#include <FWCore/Utilities/interface/InputTag.h>
#include <FWCore/Framework/interface/EventSetup.h>
#include <L1Trigger/CSCTrackFinder/src/CSCTFDTReceiver.h>

class CSCTFTrackBuilder;

class CSCTFTrackProducer : public edm::one::EDProducer<edm::one::SharedResources>
class CSCTFTrackProducer : public edm::EDProducer
{
public:
CSCTFTrackProducer(const edm::ParameterSet&);
virtual ~CSCTFTrackProducer();
void produce(edm::Event & e, const edm::EventSetup& c) override;
void produce(edm::Event & e, const edm::EventSetup& c);
void beginJob();

private:
Expand Down
4 changes: 2 additions & 2 deletions L1Trigger/CSCTrackFinder/python/csctfTrackDigisUngangedME1a_cfi.py
View file
Expand Up @@ -2,7 +2,7 @@

from L1Trigger.CSCTrackFinder.csctfTrackDigis_cfi import csctfTrackDigis as csctfTrackDigisUngangedME1a

csctfTrackDigisUngangedME1a.SectorProcessor.PTLUT.PtMethod = cms.untracked.uint32(33) # no triple ganging in ME11a
csctfTrackDigisUngangedME1a.SectorProcessor.PTLUT.PtMethod = cms.untracked.uint32(34)
csctfTrackDigisUngangedME1a.SectorProcessor.gangedME1a = cms.untracked.bool(False)
csctfTrackDigisUngangedME1a.SectorProcessor.firmwareSP = cms.uint32(20120730) #core 20120730
csctfTrackDigisUngangedME1a.SectorProcessor.firmwareSP = cms.uint32(20140515)
csctfTrackDigisUngangedME1a.SectorProcessor.initializeFromPSet = cms.bool(True)

0 comments on commit e71a186

Please sign in to comment.