Skip to content

Commit

Permalink
Try remove some comments from Static Analyzer reported in cms-sw#24361
Browse files Browse the repository at this point in the history
  • Loading branch information
Sunanda committed Aug 24, 2018
1 parent 5f25dbf commit a70e353
Show file tree
Hide file tree
Showing 13 changed files with 281 additions and 281 deletions.
13 changes: 7 additions & 6 deletions Geometry/HcalCommonData/interface/HcalDDDSimConstants.h
View file
Expand Up @@ -39,12 +39,13 @@ class HcalDDDSimConstants {
int getDepthEta16M(const int& det) const;
int getDepthEta29(const int& phi, const int& zside, const int& i) const;
int getDepthEta29M(const int& i, const bool& planOne) const;
std::pair<int,double> getDetEta(const double& eta, const int& depth);
int getEta(const int& det, const int& lay, const double& hetaR);
std::pair<int,int> getEtaDepth(const int& det, int etaR, const int& phi,
const int& zside, int depth, const int& lay);
double getEtaHO(const double& etaR, const double& x, const double& y,
const double& z) const;
std::pair<int,double> getDetEta(const double& eta, const int& depth) const;
int getEta(const int& det, const int& lay, const double& hetaR) const;
std::pair<int,int> getEtaDepth(const int& det, int etaR,
const int& phi, const int& zside,
int depth, const int& lay) const;
double getEtaHO(const double& etaR, const double& x,
const double& y, const double& z) const;
std::pair<int,int> getiEtaRange(const int& i) const {return std::pair<int,int>(hpar->etaMin[i],hpar->etaMax[i]);}
const std::vector<double> & getEtaTableHF() const {return hpar->etaTableHF;}
const std::vector<double> & getGparHF() const {return hpar->gparHF;}
Expand Down
4 changes: 2 additions & 2 deletions Geometry/HcalCommonData/interface/HcalNumberingFromDDD.h
View file
Expand Up @@ -17,7 +17,7 @@ class HcalNumberingFromDDD {

public:

HcalNumberingFromDDD(HcalDDDSimConstants * hcons);
HcalNumberingFromDDD(const HcalDDDSimConstants * hcons);
~HcalNumberingFromDDD();

struct HcalID {
Expand All @@ -35,7 +35,7 @@ class HcalNumberingFromDDD {

private:

HcalDDDSimConstants *hcalConstants;
const HcalDDDSimConstants *hcalConstants;
};

#endif
10 changes: 6 additions & 4 deletions Geometry/HcalCommonData/src/HcalDDDSimConstants.cc
View file
Expand Up @@ -207,7 +207,7 @@ int HcalDDDSimConstants::getDepthEta29M(const int& i,
}

std::pair<int,double> HcalDDDSimConstants::getDetEta(const double& eta,
const int& depth) {
const int& depth) const {

int hsubdet(0), ieta(0);
double etaR(0);
Expand All @@ -232,7 +232,7 @@ std::pair<int,double> HcalDDDSimConstants::getDetEta(const double& eta,
}

int HcalDDDSimConstants::getEta(const int& det, const int& lay,
const double& hetaR) {
const double& hetaR) const {

int ieta(0);
if (det == static_cast<int>(HcalForward)) { // Forward HCal
Expand All @@ -256,8 +256,10 @@ int HcalDDDSimConstants::getEta(const int& det, const int& lay,
}

std::pair<int,int> HcalDDDSimConstants::getEtaDepth(const int& det, int etaR,
const int& phi, const int& zside,
int depth, const int& lay) {
const int& phi,
const int& zside,
int depth,
const int& lay) const {

#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HcalGeom") << "HcalDDDEsimConstants:getEtaDepth: I/P "
Expand Down
2 changes: 1 addition & 1 deletion Geometry/HcalCommonData/src/HcalNumberingFromDDD.cc
View file
Expand Up @@ -14,7 +14,7 @@

//#define EDM_ML_DEBUG

HcalNumberingFromDDD::HcalNumberingFromDDD(HcalDDDSimConstants *hcons) :
HcalNumberingFromDDD::HcalNumberingFromDDD(const HcalDDDSimConstants *hcons) :
hcalConstants(hcons) {
#ifdef EDM_ML_DEBUG
edm::LogInfo("HCalGeom") << "Creating HcalNumberingFromDDD\n";
Expand Down
5 changes: 3 additions & 2 deletions SimG4CMS/Calo/interface/HCalSD.h
View file
Expand Up @@ -38,7 +38,8 @@ class HCalSD : public CaloSD, public Observer<const BeginOfJob *> {

public:

HCalSD(const std::string& , const DDCompactView &, const SensitiveDetectorCatalog &,
HCalSD(const std::string& , const DDCompactView &,
const SensitiveDetectorCatalog &,
edm::ParameterSet const &, const SimTrackManager*);
~HCalSD() override = default;
uint32_t setDetUnitId(const G4Step* step) override;
Expand Down Expand Up @@ -94,7 +95,7 @@ class HCalSD : public CaloSD, public Observer<const BeginOfJob *> {
std::unique_ptr<HFShowerPMT> showerPMT;
std::unique_ptr<HFShowerFibreBundle> showerBundle;

HcalDDDSimConstants* hcalConstants;
const HcalDDDSimConstants* hcalConstants;
const HBHEDarkening* m_HBDarkening;
const HBHEDarkening* m_HEDarkening;
std::unique_ptr<HFDarkening> m_HFDarkening;
Expand Down
36 changes: 18 additions & 18 deletions SimG4CMS/Calo/interface/HcalTestAnalysis.h
View file
Expand Up @@ -62,36 +62,36 @@ class HcalTestAnalysis : public SimWatcher,
private:

//Keep parameters to instantiate HcalTestHistoClass later
std::string fileName;
std::string fileName_;

// Qie Analysis
HcalQie * myqie;
int addTower;
std::unique_ptr<HcalQie> myqie_;
int addTower_;

// Private Tuples
std::unique_ptr<HcalTestHistoManager> tuplesManager;
HcalTestHistoClass *tuples;
std::unique_ptr<HcalTestHistoManager> tuplesManager_;
HcalTestHistoClass* tuples_;

// Numbering scheme
HcalNumberingFromDDD *numberingFromDDD;
HcalDDDSimConstants *hcons;
HcalTestNumberingScheme *org;
std::unique_ptr<HcalNumberingFromDDD> numberingFromDDD_;
const HcalDDDSimConstants* hcons_;
HcalTestNumberingScheme* org_;

// Hits for qie analysis
std::vector<CaloHit> caloHitCache;
std::vector<int> group_, tower_;
int nGroup, nTower;
std::vector<CaloHit> caloHitCache;
std::vector<int> group_, tower_;
int nGroup, nTower;

// to read from ParameterSet
std::vector<std::string> names;
double eta0, phi0;
int centralTower;
std::vector<std::string> names_;
double eta0_, phi0_;
int centralTower_;

// some private members for ananlysis
unsigned int count;
double edepEB, edepEE, edepHB, edepHE, edepHO;
double edepl[20];
double mudist[20]; // Distance of muon from central part
unsigned int count;
double edepEB, edepEE, edepHB, edepHE;
double edepHO, edepl[20];
double mudist[20]; // Distance of muon from central part
};

#endif
2 changes: 1 addition & 1 deletion SimG4CMS/Calo/interface/HcalTestNS.h
View file
Expand Up @@ -16,7 +16,7 @@ class HcalTestNS {

private:

HcalDDDRecConstants* hcons_;
const HcalDDDRecConstants* hcons_;

};

Expand Down
18 changes: 9 additions & 9 deletions SimG4CMS/Calo/src/CaloSD.cc
View file
Expand Up @@ -142,16 +142,16 @@ G4bool CaloSD::ProcessHits(G4Step * aStep, G4TouchableHistory * ) {
currentID.setID(unitID, time, primaryID, depth);
} else {
if(aStep->GetTotalEnergyDeposit() > 0.0) {
G4TouchableHistory* touch =(G4TouchableHistory*)(theTrack->GetTouchable());
const G4TouchableHistory* touch = static_cast<const G4TouchableHistory*>(theTrack->GetTouchable());
edm::LogInfo("CaloSim") << "CaloSD::ProcessHits: unitID= " << unitID
<< " currUnit= " << currentID.unitID()
<< " Detector: " << GetName()
<< " trackID= " << theTrack->GetTrackID()
<< " " << theTrack->GetDefinition()->GetParticleName()
<< "\n Edep= " << aStep->GetTotalEnergyDeposit()
<< " PV: " << touch->GetVolume(0)->GetName()
<< " PVid= " << touch->GetReplicaNumber(0)
<< " MVid= " << touch->GetReplicaNumber(1);
<< " currUnit= " << currentID.unitID()
<< " Detector: " << GetName()
<< " trackID= " << theTrack->GetTrackID() << " "
<< theTrack->GetDefinition()->GetParticleName()
<< "\n Edep= " << aStep->GetTotalEnergyDeposit()
<< " PV: " << touch->GetVolume(0)->GetName()
<< " PVid= " << touch->GetReplicaNumber(0)
<< " MVid= " << touch->GetReplicaNumber(1);
}
return false;
}
Expand Down

0 comments on commit a70e353

Please sign in to comment.