Skip to content

Fireworks 9_4_X: Fix bug in scaling after projected view destruction #34680

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

Merged
cmsbuild merged 6 commits into from
Aug 1, 2021
Merged

Fireworks 9_4_X: Fix bug in scaling after projected view destruction #34680

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6d4d359
Code format
alja Jul 28, 2021
6205d73
Fix crash on edit of JET and MET after view destruction.
alja Jul 26, 2021
664117c
Code format
alja Jul 28, 2021
8f9ffc1
Code format
alja Jul 28, 2021
084b197
Fix crash on edit of PFTau after view destruction
alja Jul 27, 2021
ad0ae95
Correction to previous commit: check minimum phi range when drawing s…
alja Jul 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 40 additions & 39 deletions Fireworks/Calo/interface/FWTauProxyBuilderBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
//
// Package: Calo
// Class : FWTauProxyBuilderBase
//
//
/**\class FWTauProxyBuilderBase FWTauProxyBuilderBase.h Fireworks/Calo/interface/FWTauProxyBuilderBase.h

Description: [one line class summary]
Expand All @@ -15,7 +15,7 @@

*/
//
// Original Author: Alja Mrak-Tadel
// Original Author: Alja Mrak-Tadel
// Created: Thu Oct 21 20:40:32 CEST 2010
//

Expand All @@ -27,52 +27,53 @@
class TEveScalableStraightLineSet;
class FWViewContext;

namespace reco
{
class Jet;
class BaseTau;
}
namespace reco {
class Jet;
class BaseTau;
} // namespace reco

namespace fireworks
{
class Context;
namespace fireworks {
class Context;
}


class FWTauProxyBuilderBase : public FWProxyBuilderBase
{
class FWTauProxyBuilderBase : public FWProxyBuilderBase {
public:
FWTauProxyBuilderBase();
~FWTauProxyBuilderBase() override;

bool haveSingleProduct() const override { return false; }
bool havePerViewProduct(FWViewType::EType) const override { return true; }
void scaleProduct(TEveElementList* parent, FWViewType::EType, const FWViewContext* vc) override;
void cleanLocal() override;
void setItem(const FWEventItem* iItem) override;
FWTauProxyBuilderBase();
~FWTauProxyBuilderBase() override;

bool haveSingleProduct() const override { return false; }
bool havePerViewProduct(FWViewType::EType) const override { return true; }
void scaleProduct(TEveElementList* parent, FWViewType::EType, const FWViewContext* vc) override;
void cleanLocal() override;

void setItem(const FWEventItem* iItem) override;

protected:
float m_minTheta;
float m_maxTheta;
std::vector<double> m_phis;
void buildBaseTau( const reco::BaseTau& iTau, const reco::Jet* iJet, TEveElement* comp, FWViewType::EType type, const FWViewContext* vc);
float m_minTheta;
float m_maxTheta;
std::vector<double> m_phis;
void buildBaseTau(const reco::BaseTau& iTau,
const reco::Jet* iJet,
TEveElement* comp,
FWViewType::EType type,
const FWViewContext* vc);

void localModelChanges(const FWModelId& iId,
TEveElement* iCompound,
FWViewType::EType viewType,
const FWViewContext* vc) override;

void localModelChanges(const FWModelId& iId, TEveElement* iCompound,
FWViewType::EType viewType, const FWViewContext* vc) override;
private:
FWTauProxyBuilderBase(const FWTauProxyBuilderBase&) = delete; // stop default
FWTauProxyBuilderBase(const FWTauProxyBuilderBase&) = delete; // stop default

const FWTauProxyBuilderBase& operator=(const FWTauProxyBuilderBase&) = delete; // stop default
const FWTauProxyBuilderBase& operator=(const FWTauProxyBuilderBase&) = delete; // stop default

// ---------- member data --------------------------------
// Add Tracks which passed quality cuts and
// are inside a tracker signal cone around leading Track
void addConstituentTracks( const reco::BaseTau &tau, class TEveElement *product );
// Add leading Track
void addLeadTrack( const reco::BaseTau &tau, class TEveElement *product );
std::vector<fireworks::scaleMarker> m_lines;
// ---------- member data --------------------------------
// Add Tracks which passed quality cuts and
// are inside a tracker signal cone around leading Track
void addConstituentTracks(const reco::BaseTau& tau, class TEveElement* product);
// Add leading Track
void addLeadTrack(const reco::BaseTau& tau, class TEveElement* product);
};


#endif
Loading