Skip to content

Commit

Permalink
Merge pull request #20223 from pieterdavid/removeSiStripSubDetId_remo…
Browse files Browse the repository at this point in the history 
…veObsoleteDQMcode

Remove obsolete methods in SiStrip DQM that use subdetector-DetId classes
  • Loading branch information
@cmsbuild
cmsbuild committed Aug 23, 2017
2 parents c9055a3 + 08ace25 commit c585de6
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 146 deletions.
13 changes: 6 additions & 7 deletions DQM/SiStripCommon/interface/SiStripFolderOrganizer.h
View file
Expand Up @@ -59,27 +59,26 @@ class SiStripFolderOrganizer
// unsigned short i2c
);

std::pair<std::string,int32_t> GetSubDetAndLayer(const uint32_t& detid, const TrackerTopology* tTopo, bool ring_flag = 0);
std::pair<std::string,int32_t> GetSubDetAndLayer(const uint32_t& detid, const TrackerTopology* tTopo, bool ring_flag = false);
std::pair<std::string,int32_t> GetSubDetAndLayerThickness(const uint32_t& detid, const TrackerTopology* tTopo, std::string & cThickness);
std::pair<std::string,int32_t> GetSubDetAndRing(const uint32_t& detid, const TrackerTopology* tTopo);
// detector folders
void setDetectorFolder(uint32_t rawdetid, const TrackerTopology* tTopo);
void getFolderName(int32_t rawdetid, const TrackerTopology* tTopo, std::string& lokal_folder);
void getFolderName(int32_t rawdetid, std::string& lokal_folder); // deprecated version, still needed for now

// layer folders
void setLayerFolder(uint32_t rawdetid,const TrackerTopology* tTopo,int32_t layer=0,bool ring_flag = 0);
void getLayerFolderName(std::stringstream& ss, uint32_t rawdetid, const TrackerTopology* tTopo, bool ring_flag = 0);
void setLayerFolder(uint32_t rawdetid,const TrackerTopology* tTopo,int32_t layer=0,bool ring_flag = false);
void getLayerFolderName(std::stringstream& ss, uint32_t rawdetid, const TrackerTopology* tTopo, bool ring_flag = false);
void getSubDetLayerFolderName(std::stringstream& ss, SiStripDetId::SubDetector subDet, uint32_t layer, uint32_t side=0);
// ring folder
void setRingFolder(uint32_t rawdetid,const TrackerTopology* tTopo,int32_t layer=0) { setLayerFolder(rawdetid,tTopo,layer,true); }
void getRingFolderName(std::stringstream& ss, uint32_t rawdetid, const TrackerTopology* tTopo) { getLayerFolderName(ss,rawdetid,tTopo,true); }
// SubDetector Folder
void getSubDetFolder(const uint32_t& detid, const TrackerTopology* tTopo, std::string& folder_name);
std::pair<const std::string, const char *> getSubDetFolderAndTag(const uint32_t& detid, const TrackerTopology* tTopo);
private:
SiStripFolderOrganizer(const SiStripFolderOrganizer&); // stop default
const SiStripFolderOrganizer& operator=(const SiStripFolderOrganizer&); // stop default

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

private:
std::string TopFolderName;
Expand Down
62 changes: 0 additions & 62 deletions DQM/SiStripCommon/src/SiStripFolderOrganizer.cc
View file
Expand Up @@ -498,65 +498,3 @@ std::pair<const std::string, const char *> SiStripFolderOrganizer::getSubDetFold

return std::pair<const std::string, const char *>(folder, tag);
}


// This is the deprecated version, still needed for now.
#include "DataFormats/SiStripDetId/interface/TIBDetId.h"
#include "DataFormats/SiStripDetId/interface/TOBDetId.h"
#include "DataFormats/SiStripDetId/interface/TIDDetId.h"
#include "DataFormats/SiStripDetId/interface/TECDetId.h"

void SiStripFolderOrganizer::getFolderName(int32_t rawdetid, std::string& lokal_folder){
lokal_folder = "";
if(rawdetid == 0 ){ // just top MechanicalFolder if rawdetid==0;
return;
}
std::stringstream rest;
SiStripDetId stripdet = SiStripDetId(rawdetid);

if (stripdet.subDetector() == SiStripDetId::TIB){
// --------------------------- TIB --------------------------- //
TIBDetId tib = TIBDetId(rawdetid);
getSubDetLayerFolderName(rest,stripdet.subDetector(),tib.layerNumber());
if (tib.isZMinusSide()) rest << "backward_strings" << SEP;
else rest << "forward_strings" << SEP;
if (tib.isExternalString()) rest << "external_strings" << SEP;
else rest << "internal_strings" << SEP;
rest << "string_" << tib.stringNumber() << SEP << "module_" << rawdetid;
} else if(stripdet.subDetector() == SiStripDetId::TID){
// --------------------------- TID --------------------------- //
TIDDetId tid = TIDDetId(rawdetid);
getSubDetLayerFolderName(rest,stripdet.subDetector(),tid.wheel(),tid.side());
rest<< "ring_" << tid.ring() << SEP;

if (tid.isStereo()) rest << "stereo_modules" << SEP;
else rest << "mono_modules" << SEP;
rest << "module_" << rawdetid;
} else if( stripdet.subDetector() == SiStripDetId::TOB){
// --------------------------- TOB --------------------------- //
TOBDetId tob = TOBDetId(rawdetid);
getSubDetLayerFolderName(rest,stripdet.subDetector(),tob.layerNumber());
if (tob.isZMinusSide()) rest << "backward_rods" << SEP;
else rest << "forward_rods" << SEP;
rest << "rod_" << tob.rodNumber() << SEP<< "module_" << rawdetid;
}else if(stripdet.subDetector() == SiStripDetId::TEC){
// --------------------------- TEC --------------------------- //
TECDetId tec = TECDetId(rawdetid);
getSubDetLayerFolderName(rest,stripdet.subDetector(),tec.wheel(),tec.side());
if (tec.isBackPetal()) rest << "backward_petals" << SEP;
else rest << "forward_petals" << SEP;

rest << "petal_" << tec.petalNumber() << SEP
<< "ring_"<< tec.ringNumber() << SEP;

if (tec.isStereo()) rest << "stereo_modules" << SEP;
else rest << "mono_modules" << SEP;

rest << "module_" << rawdetid;
}else{
// --------------------------- ??? --------------------------- //
edm::LogWarning("SiStripTkDQM|WrongInput")<<"no such subdetector type :"<<stripdet.subDetector() <<" no folder set!"<<std::endl;
return;
}
lokal_folder += rest.str();
}
10 changes: 2 additions & 8 deletions DQM/SiStripHistoricInfoClient/interface/HDQMInspectorConfigSiStrip.h
View file
Expand Up @@ -2,7 +2,7 @@
#define GUARD_HDQMInspectorConfigSiStrip_h

#include <string>
#include <stdint.h>
#include <cstdint>

#include "DQMServices/Diagnostic/interface/HDQMInspectorConfigBase.h"

Expand All @@ -11,12 +11,6 @@ class HDQMInspectorConfigSiStrip : public HDQMInspectorConfigBase
{
public:
HDQMInspectorConfigSiStrip ();
virtual ~HDQMInspectorConfigSiStrip ();

std::string translateDetId (const uint32_t) const;

~HDQMInspectorConfigSiStrip () override;
};



#endif
9 changes: 2 additions & 7 deletions DQM/SiStripHistoricInfoClient/interface/HDQMInspectorConfigTracking.h
View file
Expand Up @@ -2,19 +2,14 @@
#define GUARD_HDQMInspectorConfigTracking_h

#include <string>
#include <stdint.h>
#include <cstdint>

#include "DQMServices/Diagnostic/interface/HDQMInspectorConfigBase.h"

class HDQMInspectorConfigTracking : public HDQMInspectorConfigBase
{
public:
HDQMInspectorConfigTracking ();
virtual ~HDQMInspectorConfigTracking ();

std::string translateDetId (const uint32_t) const;
~HDQMInspectorConfigTracking () override;
};



#endif
42 changes: 0 additions & 42 deletions DQM/SiStripHistoricInfoClient/src/HDQMInspectorConfigSiStrip.cc
View file
Expand Up @@ -18,45 +18,3 @@ HDQMInspectorConfigSiStrip::HDQMInspectorConfigSiStrip ()
HDQMInspectorConfigSiStrip::~HDQMInspectorConfigSiStrip ()
{
}


std::string HDQMInspectorConfigSiStrip::translateDetId(const uint32_t id) const
{
std::stringstream Name;

uint32_t rawdetid = id;
SiStripDetId stripdet = SiStripDetId(rawdetid);

if(stripdet.subDetector() == SiStripDetId::TIB) {
Name << "TIB";
} else if(stripdet.subDetector() == SiStripDetId::TID) {
TIDDetId tid1 = TIDDetId(rawdetid);
if( tid1.side() == 1 ) {
Name << "TID-";
}
else if( tid1.side() == 2 ) {
Name << "TID+";
}
else {
Name << "???";
}
} else if(stripdet.subDetector() == SiStripDetId::TOB) {
Name << "TOB";
} else if( stripdet.subDetector() == SiStripDetId::TEC) {
TECDetId tec1 = TECDetId(rawdetid);
if( tec1.side() == 1 ) {
Name << "TEC-";
}
else if( tec1.side() == 2 ) {
Name << "TEC+";
}
else {
Name << "???";
}
} else{
Name << "???";
}

return Name.str();

}
15 changes: 0 additions & 15 deletions DQM/SiStripHistoricInfoClient/src/HDQMInspectorConfigTracking.cc
View file
Expand Up @@ -14,18 +14,3 @@ HDQMInspectorConfigTracking::HDQMInspectorConfigTracking ()
HDQMInspectorConfigTracking::~HDQMInspectorConfigTracking ()
{
}


std::string HDQMInspectorConfigTracking::translateDetId(const uint32_t id) const
{
std::stringstream Name;

if(id == 268435456) {
Name << "Tracker";
} else{
Name << "???";
}

return Name.str();

}
6 changes: 1 addition & 5 deletions DQMServices/Diagnostic/interface/HDQMInspectorConfigBase.h
View file
Expand Up @@ -5,7 +5,7 @@
#include <string>
#include <vector>
#include <map>
#include <stdint.h>
#include <cstdint>

/**
* @author: M. De Mattia
Expand All @@ -15,8 +15,6 @@
* for the classes used to pass detector specific information to the
* HDQMInspector. <br>
* The methods defined are:
* - translateDetId: a pure virtual method that receives the DetId and
* returns a string. <br>
* - valueErrorMap: a method filling a vector<pair<string, string> >
* to associate user defined values with the corresponding errors. This
* is optional and by default it will return false. <br>
Expand All @@ -36,8 +34,6 @@ class HDQMInspectorConfigBase
public:
HDQMInspectorConfigBase () {};
virtual ~HDQMInspectorConfigBase () {};
/// pure virtual method that convert a DetId to a string
virtual std::string translateDetId( const uint32_t ) const = 0;
/// fills a vector<pair<string, string> > associating values with the corresponding errors
virtual bool valueErrorMap(std::vector<std::pair<std::string, std::string> > & valueErrorVector) const {return false;}
/// fills the list of names of quantities for which a summation over the runs is required
Expand Down

0 comments on commit c585de6

Please sign in to comment.