Skip to content

Commit

Permalink
Merge pull request #567 from mtosi/from-CMSSW_7_0_0_pre2_endcap_namin…
Browse files Browse the repository at this point in the history 
…g_patchQT

DQM SiStrip endcap naming
  • Loading branch information
@ktf
ktf committed Aug 22, 2013
2 parents 3758ca8 + 3747564 commit f4c68ce
Show file tree
Hide file tree
Showing 34 changed files with 594 additions and 360 deletions.
81 changes: 62 additions & 19 deletions DQM/SiStripCommon/src/SiStripFolderOrganizer.cc
View file
Expand Up @@ -156,16 +156,24 @@ void SiStripFolderOrganizer::setDetectorFolder(uint32_t rawdetid, const TrackerT
}

void SiStripFolderOrganizer::getSubDetLayerFolderName(std::stringstream& ss, SiStripDetId::SubDetector subDet, uint32_t layer, uint32_t side){
// std::cout << "[SiStripFolderOrganizer::getSubDetLayerFolderName] TopFolderName: " << TopFolderName << std::endl;
ss << TopFolderName << SEP << MECHANICAL_FOLDER_NAME;

std::stringstream sside;
if (side == 1) {
sside << "MINUS";
} else if (side == 2) {
sside << "PLUS";
}

if(subDet == SiStripDetId::TIB){
ss << SEP << "TIB" << SEP << "layer_" << layer << SEP;
} else if(subDet == SiStripDetId::TID){
ss << SEP << "TID" << SEP << "side_" << side << SEP << "wheel_" << layer << SEP;
ss << SEP << "TID" << SEP << sside.str() << SEP << "wheel_" << layer << SEP;
} else if( subDet == SiStripDetId::TOB){
ss << SEP << "TOB" << SEP << "layer_" << layer << SEP;
}else if(subDet == SiStripDetId::TEC){
ss << SEP << "TEC" << SEP << "side_" << side << SEP << "wheel_" << layer << SEP;
ss << SEP << "TEC" << SEP << sside.str() << SEP << "wheel_" << layer << SEP;
}else{
// --------------------------- ??? --------------------------- //
edm::LogWarning("SiStripTkDQM|WrongInput")<<"no such SubDet :"<< subDet <<" no folder set!"<<std::endl;
Expand Down Expand Up @@ -252,19 +260,29 @@ void SiStripFolderOrganizer::setLayerFolder(uint32_t rawdetid, const TrackerTopo
// --------------------------- TID --------------------------- //

int tid_ring = tTopo->tidRing(rawdetid);

// side
uint32_t side = tTopo->tidSide(rawdetid);
std::stringstream sside;
if (side == 1) {
sside << "MINUS";
} else if (side == 2) {
sside << "PLUS";
}

if(ring_flag){
if(abs(layer) != tid_ring) {
edm::LogWarning("SiStripTkDQM|Layer mismatch!!!")<< " expect "<< abs(layer) << " but getting " << tTopo->tidRing(rawdetid) <<std::endl;
return;
}
rest<<SEP<<"TID"<<SEP<<"side_"<<tTopo->tidSide(rawdetid)<<SEP<<"ring_"<<tTopo->tidRing(rawdetid);
rest<<SEP<<"TID"<<SEP<<sside.str()<<SEP<<"ring_"<<tTopo->tidRing(rawdetid);
}else{
int tid_wheel = tTopo->tidWheel(rawdetid);
if (abs(layer) != tid_wheel) {
if (abs(layer) != tid_wheel) {
edm::LogWarning("SiStripTkDQM|Layer mismatch!!!")<< " expect "<< abs(layer) << " but getting " << tTopo->tidWheel(rawdetid) <<std::endl;
return;
}
rest<<SEP<<"TID"<<SEP<<"side_"<<tTopo->tidSide(rawdetid)<<SEP<<"wheel_"<<tTopo->tidWheel(rawdetid);
rest<<SEP<<"TID"<<SEP<<sside.str()<<SEP<<"wheel_"<<tTopo->tidWheel(rawdetid);
}
}else if(stripdet.subDetector() == SiStripDetId::TOB){
// --------------------------- TOB --------------------------- //
Expand All @@ -278,20 +296,29 @@ void SiStripFolderOrganizer::setLayerFolder(uint32_t rawdetid, const TrackerTopo
}else if( stripdet.subDetector() == SiStripDetId::TEC){
// --------------------------- TEC --------------------------- //

// side
uint32_t side = tTopo->tecSide(rawdetid);
std::stringstream sside;
if (side == 1) {
sside << "MINUS";
} else if (side == 2) {
sside << "PLUS";
}

if(ring_flag){
int tec_ring = tTopo->tecRing(rawdetid);
if (abs(layer) != tec_ring) {
edm::LogWarning("SiStripTkDQM|Layer mismatch!!!")<< " expect "<< abs(layer) << " but getting " << tTopo->tecRing(rawdetid) <<std::endl;
return;
}
rest<<SEP<<"TEC"<<SEP<<"side_"<<tTopo->tecSide(rawdetid)<<SEP<<"ring_"<<tTopo->tecRing(rawdetid);
rest<<SEP<<"TEC"<<SEP<<sside.str()<<SEP<<"ring_"<<tTopo->tecRing(rawdetid);
}else{
int tec_wheel = tTopo->tecWheel(rawdetid);
if (abs(layer) != tec_wheel) {
edm::LogWarning("SiStripTkDQM|Layer mismatch!!!")<< " expect "<< abs(layer) << " but getting " << tTopo->tecWheel(rawdetid) <<std::endl;
return;
}
rest<<SEP<<"TEC"<<SEP<<"side_"<<tTopo->tecSide(rawdetid)<<SEP<<"wheel_"<<tTopo->tecWheel(rawdetid);
rest<<SEP<<"TEC"<<SEP<<sside.str()<<SEP<<"wheel_"<<tTopo->tecWheel(rawdetid);
}
}else{
// --------------------------- ??? --------------------------- //
Expand Down Expand Up @@ -325,10 +352,18 @@ void SiStripFolderOrganizer::getLayerFolderName(std::stringstream& ss, uint32_t
}else if(stripdet.subDetector() == SiStripDetId::TID){
// --------------------------- TID --------------------------- //

uint32_t side = tTopo->tidSide(rawdetid);
std::stringstream sside;
if (side == 1) {
sside << "MINUS";
} else if (side == 2) {
sside << "PLUS";
}

if(ring_flag){
ss<<SEP<<"TID"<<SEP<<"side_"<<tTopo->tidSide(rawdetid)<<SEP<<"ring_"<<tTopo->tidRing(rawdetid);
ss<<SEP<<"TID"<<SEP<<sside.str()<<SEP<<"ring_"<<tTopo->tidRing(rawdetid);
}else{
ss<<SEP<<"TID"<<SEP<<"side_"<<tTopo->tidSide(rawdetid)<<SEP<<"wheel_"<<tTopo->tidWheel(rawdetid);
ss<<SEP<<"TID"<<SEP<<sside.str()<<SEP<<"wheel_"<<tTopo->tidWheel(rawdetid);
}
}else if(stripdet.subDetector() == SiStripDetId::TOB){
// --------------------------- TOB --------------------------- //
Expand All @@ -337,10 +372,18 @@ void SiStripFolderOrganizer::getLayerFolderName(std::stringstream& ss, uint32_t
}else if( stripdet.subDetector() == SiStripDetId::TEC){
// --------------------------- TEC --------------------------- //

uint32_t side = tTopo->tecSide(rawdetid);
std::stringstream sside;
if (side == 1) {
sside << "MINUS";
} else if (side == 2) {
sside << "PLUS";
}

if(ring_flag){
ss<<SEP<<"TEC"<<SEP<<"side_"<<tTopo->tecSide(rawdetid)<<SEP<<"ring_"<<tTopo->tecRing(rawdetid);
ss<<SEP<<"TEC"<<SEP<<sside.str()<<SEP<<"ring_"<<tTopo->tecRing(rawdetid);
}else{
ss<<SEP<<"TEC"<<SEP<<"side_"<<tTopo->tecSide(rawdetid)<<SEP<<"wheel_"<<tTopo->tecWheel(rawdetid);
ss<<SEP<<"TEC"<<SEP<<sside.str()<<SEP<<"wheel_"<<tTopo->tecWheel(rawdetid);
}
}else{
// --------------------------- ??? --------------------------- //
Expand All @@ -367,20 +410,20 @@ std::pair<std::string, std::string> SiStripFolderOrganizer::getSubDetFolderAndTa
break;
case StripSubdetector::TID:
if (tTopo->tidSide(detid) == 2) {
subdet_folder = "TID/side_2";
result.second = "TID__side__2";
subdet_folder = "TID/PLUS";
result.second = "TID__PLUS";
} else if (tTopo->tidSide(detid) == 1) {
subdet_folder = "TID/side_1";
result.second = "TID__side__1";
subdet_folder = "TID/MINUS";
result.second = "TID__MINUS";
}
break;
case StripSubdetector::TEC:
if (tTopo->tecSide(detid) == 2) {
subdet_folder = "TEC/side_2";
result.second = "TEC__side__2";
subdet_folder = "TEC/PLUS";
result.second = "TEC__PLUS";
} else if (tTopo->tecSide(detid) == 1) {
subdet_folder = "TEC/side_1";
result.second = "TEC__side__1";
subdet_folder = "TEC/MINUS";
result.second = "TEC__MINUS";
}
break;
default:
Expand Down
25 changes: 21 additions & 4 deletions DQM/SiStripCommon/src/SiStripHistoId.cc
View file
Expand Up @@ -95,17 +95,34 @@ std::string SiStripHistoId::getSubdetid(uint32_t id, const TrackerTopology* tTop
}else if( subdet.subdetId() == StripSubdetector::TID){
// --------------------------- TID --------------------------- //

if (flag_ring) snprintf(temp_str, buf_len, "TID__side__%i__ring__%i", tTopo->tidSide(id), tTopo->tidRing(id));
else snprintf(temp_str, buf_len, "TID__side__%i__wheel__%i", tTopo->tidSide(id), tTopo->tidWheel(id));
std::string side = "";
if (tTopo->tidSide(id) == 1)
side = "MINUS";
else if (tTopo->tidSide(id) == 2)
side = "PLUS";

if (flag_ring)
snprintf(temp_str, buf_len, "TID__%s__ring__%i", side.c_str(), tTopo->tidRing(id) );
else
snprintf(temp_str, buf_len, "TID__%s__wheel__%i", side.c_str(), tTopo->tidWheel(id));

}else if(subdet.subdetId() == StripSubdetector::TOB){
// --------------------------- TOB --------------------------- //

snprintf(temp_str, buf_len, "TOB__layer__%i",tTopo->tobLayer(id));
}else if(subdet.subdetId() == StripSubdetector::TEC){
// --------------------------- TEC --------------------------- //

if (flag_ring) snprintf(temp_str, buf_len, "TEC__side__%i__ring__%i", tTopo->tecSide(id), tTopo->tecRing(id));
else snprintf(temp_str, buf_len, "TEC__side__%i__wheel__%i", tTopo->tecSide(id), tTopo->tecWheel(id));
std::string side = "";
if (tTopo->tecSide(id) == 1)
side = "MINUS";
else if (tTopo->tecSide(id) == 2)
side = "PLUS";

if (flag_ring)
snprintf(temp_str, buf_len, "TEC__%s__ring__%i", side.c_str(), tTopo->tecRing(id) );
else
snprintf(temp_str, buf_len, "TEC__%s__wheel__%i", side.c_str(), tTopo->tecWheel(id));
}else{
// --------------------------- ??? --------------------------- //
edm::LogError("SiStripTkDQM|WrongInput")<<"no such subdetector type :"<<subdet.subdetId()<<" no folder set!"<<std::endl;
Expand Down
7 changes: 5 additions & 2 deletions DQM/SiStripCommon/src/TkHistoMap.cc
View file
Expand Up @@ -97,18 +97,21 @@ std::string TkHistoMap::folderDefinition(std::string& path, std::string& MapName
std::string folder=path;
std::string name=MapName+std::string("_");
fullName=name+tkdetmap_->getLayerName(layer);

// std::cout << "[TkHistoMap::folderDefinition] fullName: " << fullName << std::endl;

if(mechanicalView){
std::stringstream ss;

SiStripFolderOrganizer folderOrg;

folderOrg.setSiStripFolderName(path);

SiStripDetId::SubDetector subDet;
uint32_t subdetlayer, side;
tkdetmap_->getSubDetLayerSide(layer,subDet,subdetlayer,side);
folderOrg.getSubDetLayerFolderName(ss,subDet,subdetlayer,side);

folder = ss.str();
// std::cout << "[TkHistoMap::folderDefinition] folder: " << folder << std::endl;
}
dqmStore_->setCurrentFolder(folder);
return folder;
Expand Down
8 changes: 4 additions & 4 deletions DQM/SiStripMonitorClient/bin/listbadmodule.cc
View file
Expand Up @@ -63,11 +63,11 @@ void listbadmodule(std::string filename, std::string pclfilename) {

std::vector<std::string> subdet;
subdet.push_back("TIB");
subdet.push_back("TID/side_1");
subdet.push_back("TID/side_2");
subdet.push_back("TID/MINUS");
subdet.push_back("TID/PLUS");
subdet.push_back("TOB");
subdet.push_back("TEC/side_1");
subdet.push_back("TEC/side_2");
subdet.push_back("TEC/MINUS");
subdet.push_back("TEC/PLUS");

std::string nrun = filename.substr(filename.find("_R000")+5, 6);
int fileNum = atoi(nrun.c_str());
Expand Down
8 changes: 4 additions & 4 deletions DQM/SiStripMonitorClient/bin/modulediff.cc
View file
Expand Up @@ -157,11 +157,11 @@ int read_badmodlist ( int run , string repro_type , vector < int >& badlist )

vector<string> subdet;
subdet.push_back("TIB");
subdet.push_back("TID/side_1");
subdet.push_back("TID/side_2");
subdet.push_back("TID/MINUS");
subdet.push_back("TID/PLUS");
subdet.push_back("TOB");
subdet.push_back("TEC/side_1");
subdet.push_back("TEC/side_2");
subdet.push_back("TEC/MINUS");
subdet.push_back("TEC/PLUS");

string nrun = filename.substr ( filename.find( "_R000" ) + 5 , 6 );

Expand Down

0 comments on commit f4c68ce

Please sign in to comment.