Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make puppi algo better readable #28104

Merged
merged 2 commits into from Oct 4, 2019
Merged

Make puppi algo better readable #28104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10b7ff0
simplify register
ahinzmann Oct 2, 2019
062fa20
code format
ahinzmann Oct 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion CommonTools/PileupAlgos/interface/PuppiAlgo.h
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@ class PuppiAlgo {
void reset();
void fixAlgoEtaBin(int i_eta);
void add(const PuppiCandidate &iParticle, const double &iVal, const unsigned int iAlgo);
void computeMedRMS(const unsigned int &iAlgo, const double &iPVFrac);
void computeMedRMS(const unsigned int &iAlgo);
//Get the Weight
double compute(std::vector<double> const &iVals, double iChi2) const;
const std::vector<float> &alphas() { return fPups; }
Expand Down
20 changes: 5 additions & 15 deletions CommonTools/PileupAlgos/src/PuppiAlgo.cc
View file
Open in desktop
Expand Up @@ -92,35 +92,25 @@ void PuppiAlgo::add(const PuppiCandidate &iParticle, const double &iVal, const u
// In CMSSW we use the user_index to specify the index in the input collection, so I invented
// a new mechanism using the fastjet UserInfo functionality. Of course, it's still just an integer
// but that interface could be changed (or augmented) if desired / needed.
int puppi_register = iParticle.puppi_register();
if (puppi_register == std::numeric_limits<int>::lowest()) {
int puppi_id = iParticle.puppi_register();
if (puppi_id == std::numeric_limits<int>::lowest()) {
throw cms::Exception("PuppiRegisterNotSet") << "The puppi register is not set. This must be set before use.\n";
}

//// original code
// if(fCharged[iAlgo] && std::abs(puppi_register) < 1) return;
// if(fCharged[iAlgo] && (std::abs(puppi_register) >=1 && std::abs(puppi_register) <=2)) fPupsPV.push_back(iVal);
//if(fCharged[iAlgo] && std::abs(puppi_register) < 3) return;
//// if used fCharged and not CHPU, just return
// fPups.push_back(iVal); //original
// fNCount[iAlgo]++;

// added by Nhan -- for all eta regions, compute mean/RMS from the central charged PU
//std::cout << "std::abs(puppi_register) = " << std::abs(puppi_register) << std::endl;
if ((std::abs(iParticle.eta()) < fEtaMaxExtrap) && (std::abs(puppi_register) >= 3)) {
if ((std::abs(iParticle.eta()) < fEtaMaxExtrap) && (puppi_id == 2)) {
fPups.push_back(iVal);
// fPupsPV.push_back(iVal);
fNCount[iAlgo]++;
}
// for the low PU case, correction. for checking that the PU-only median will be below the PV particles
if (std::abs(iParticle.eta()) < fEtaMaxExtrap && (std::abs(puppi_register) >= 1 && std::abs(puppi_register) <= 2))
if (std::abs(iParticle.eta()) < fEtaMaxExtrap && (puppi_id == 1))
fPupsPV.push_back(iVal);
}

////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
//NHAN'S VERSION
void PuppiAlgo::computeMedRMS(const unsigned int &iAlgo, const double &iPVFrac) {
void PuppiAlgo::computeMedRMS(const unsigned int &iAlgo) {
//std::cout << "fNCount[iAlgo] = " << fNCount[iAlgo] << std::endl;
if (iAlgo >= fNAlgos)
return;
Expand Down
18 changes: 3 additions & 15 deletions CommonTools/PileupAlgos/src/PuppiContainer.cc
View file
Open in desktop
Expand Up @@ -52,28 +52,16 @@ void PuppiContainer::initialize(const std::vector<RecoObj> &iRecoObjects) {
curPseudoJet.reset_PtYPhiM(0, 99., 0, 0); //skipping may have been a better choice
}
//curPseudoJet.reset_PtYPhiM(rParticle.pt,rParticle.eta,rParticle.phi,rParticle.m);
int puppi_register = 0;
if (rParticle.id == 0 or rParticle.charge == 0)
puppi_register = 0; // zero is neutral hadron
if (rParticle.id == 1 and rParticle.charge != 0)
puppi_register = rParticle.charge; // from PV use the
if (rParticle.id == 2 and rParticle.charge != 0)
puppi_register = rParticle.charge + 5; // from NPV use the charge as key +5 as key
curPseudoJet.set_info(puppi_register);
// fill puppi_register
curPseudoJet.set_info(rParticle.id);
// fill vector of pseudojets for internal references
fPFParticles.push_back(curPseudoJet);
//Take Charged particles associated to PV
if (std::abs(rParticle.id) == 1)
fChargedPV.push_back(curPseudoJet);
if (std::abs(rParticle.id) >= 1)
fPVFrac += 1.;
//if(rParticle.id == 3) _chargedNoPV.push_back(curPseudoJet);
// if(fNPV < rParticle.vtxId) fNPV = rParticle.vtxId;
}
if (fPVFrac != 0)
fPVFrac = double(fChargedPV.size()) / fPVFrac;
else
fPVFrac = 0;
}
PuppiContainer::~PuppiContainer() {}

Expand Down Expand Up @@ -192,7 +180,7 @@ void PuppiContainer::getRMSAvg(int iOpt,
}
}
for (int i0 = 0; i0 < fNAlgos; i0++)
fPuppiAlgo[i0].computeMedRMS(iOpt, fPVFrac);
fPuppiAlgo[i0].computeMedRMS(iOpt);
}
//In fact takes the median not the average
void PuppiContainer::getRawAlphas(int iOpt,
Expand Down