cms-l1t-offline / cmssw

CMS Offline Software
cms-sw.github.io/cmssw
Apache License 2.0
17 stars 27 forks source link

Homework from PR 13768 #220

Open mulhearn opened 8 years ago

mulhearn commented 8 years ago

Some issues were raised during PR cms-sw#13768 which we prefer to handle outside of that PR. We are tacking these here:

Additional issues during PR cms-sw#14104

> @@ -361,6 +361,23 @@ L1TComparison::endJob() {
>    if (jetCheck_)  cout << "jet:   " << jetFails_ << "\n";
>    if (sumCheck_)  cout << "sum:   " << sumFails_ << "\n";
>    if (muonCheck_) cout << "muon:  " << muonFails_ << "\n";
> +
> +  int fail = 0;
@mulhearn - why not a bool?
> +  // double parameters indices
> +  enum dpIdx {maxdr=0, maxdrEtaFine=1};
> +
> +  // input enable indices
> +  enum linkNr {CALOLINK1=8, EMTFPLINK1=36, OMTFPLINK1=42, BMTFLINK1=48, OMTFNLINK1=60, EMTFNLINK1=66}; // link numbers start at 0
> +
> +  L1TMuonGlobalParamsHelper() { pnodes_.resize(NUM_GMTPARAMNODES); }
> +  L1TMuonGlobalParamsHelper(const L1TMuonGlobalParams &);
> +  ~L1TMuonGlobalParamsHelper() {}
> +
> +  // FW version
> +  unsigned fwVersion() const { return pnodes_[FWVERSION].uparams_.size() > FWVERSION_IDX ? pnodes_[FWVERSION].uparams_[FWVERSION_IDX] : 0; }
> +  void setFwVersion(unsigned fwVersion);
> +
> +  // Input disables
> +  std::bitset<72> inputsToDisable() const { return inputFlags(INPUTS_TO_DISABLE); };
@mulhearn - lets think about how to replace all of these magic numbers
nsmith- commented 8 years ago

In addition, updates to the l1t-integration-CMSSW_8_0_2 branch since l1-tsg-v4 will cause a bit of a nasty merge conflict. As soon as we get a new CMSSW release with this merge incorporated, I will create a 3-way patch to resolve the merge conflicts due to Layer 1 packages for you.

nsmith- commented 8 years ago

This patch can be applied after merging l1t-integration-v34 into new CMSSW80X release that contains l1-tsg-v4 to resolve differences in L1Trigger/L1TCaloLayer1 package https://ncsmith.web.cern.ch/ncsmith/L1TStage2Misc/merge_l1t-integration-v34..CMSSW80X.patch