---

yaml --- r: 73722 b: "refs/heads/CMSSW_7_1_X" c: c48a25f h: "refs/heads/CMSSW_7_1_X" v: v3
cms-sw · Sep 18, 2009 · f36ad94 · f36ad94
1 parent 9e8c6b0
commit f36ad94
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,3 +1,3 @@
 ---
 refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e
-"refs/heads/CMSSW_7_1_X": f9cf38ede0577761aabe8b0a97d7f3b0a8e7c507
+"refs/heads/CMSSW_7_1_X": c48a25fcdc597f346d018253421e4d53d97ea477
diff --git a/trunk/DQM/SiStripCommon/src/SiStripFolderOrganizer.cc b/trunk/DQM/SiStripCommon/src/SiStripFolderOrganizer.cc
@@ -9,7 +9,7 @@
 // Original Author:  dkcira
 //         Created:  Thu Jan 26 23:52:43 CET 2006
 
-// $Id: SiStripFolderOrganizer.cc,v 1.24 2009/05/29 10:33:35 dutta Exp $
+// $Id: SiStripFolderOrganizer.cc,v 1.25 2009/08/28 19:06:42 dutta Exp $
 //
 
 #include <iostream>
@@ -245,22 +245,25 @@ void SiStripFolderOrganizer::setLayerFolder(uint32_t rawdetid, int32_t layer, bo
   if(stripdet.subDetector() == SiStripDetId::TIB ){
   // ---------------------------  TIB  --------------------------- //
     TIBDetId tib1 = TIBDetId(rawdetid);
-    if (abs(layer)  != tib1.layer()) {
+    int tib_layer = tib1.layer();
+    if (abs(layer)  != tib_layer) {
       LogWarning("SiStripTkDQM|Layer mismatch!!!")<< " expect "<<  abs(layer) << " but getting " << tib1.layer() <<endl;
       return;
     }
     rest<<sep<<"TIB"<<sep<<"layer_"<<tib1.layer();
   }else if(stripdet.subDetector() == SiStripDetId::TID){
   // ---------------------------  TID  --------------------------- //
     TIDDetId tid1 = TIDDetId(rawdetid);
+    int tid_ring = tid1.ring();
     if(ring_flag){
-      if(abs(layer) != tid1.ring()) {
+      if(abs(layer) != tid_ring) {
 	LogWarning("SiStripTkDQM|Layer mismatch!!!")<< " expect "<<  abs(layer) << " but getting " << tid1.ring() <<endl;
 	return;
       }
       rest<<sep<<"TID"<<sep<<"side_"<<tid1.side()<<sep<<"ring_"<<tid1.ring();
     }else{
-      if (abs(layer)  != tid1.wheel()) {
+      int tid_wheel = tid1.wheel();
+      if (abs(layer)  != tid_wheel) {
 	LogWarning("SiStripTkDQM|Layer mismatch!!!")<< " expect "<<  abs(layer) << " but getting " << tid1.wheel() <<endl;
 	return;
       }
@@ -269,7 +272,8 @@ void SiStripFolderOrganizer::setLayerFolder(uint32_t rawdetid, int32_t layer, bo
   }else if(stripdet.subDetector() == SiStripDetId::TOB){
   // ---------------------------  TOB  --------------------------- //
     TOBDetId tob1 = TOBDetId(rawdetid);
-    if (abs(layer)  != tob1.layer()) {
+    int tob_layer = tob1.layer();
+    if (abs(layer)  != tob_layer) {
       LogWarning("SiStripTkDQM|Layer mismatch!!!")<< " expect "<<  abs(layer) << " but getting " << tob1.layer() <<endl;
       return;
     }
@@ -278,13 +282,15 @@ void SiStripFolderOrganizer::setLayerFolder(uint32_t rawdetid, int32_t layer, bo
   // ---------------------------  TEC  --------------------------- //
     TECDetId tec1 = TECDetId(rawdetid);
     if(ring_flag){
-      if (abs(layer)  != tec1.ring()) {
+      int tec_ring = tec1.ring(); 
+      if (abs(layer)  != tec_ring) {
 	LogWarning("SiStripTkDQM|Layer mismatch!!!")<< " expect "<<  abs(layer) << " but getting " << tec1.ring() <<endl;
 	return;
       }
       rest<<sep<<"TEC"<<sep<<"side_"<<tec1.side()<<sep<<"ring_"<<tec1.ring();
     }else{
-      if (abs(layer)  != tec1.wheel()) {
+      int tec_wheel = tec1.wheel();
+      if (abs(layer)  != tec_wheel) {
 	LogWarning("SiStripTkDQM|Layer mismatch!!!")<< " expect "<<  abs(layer) << " but getting " << tec1.wheel() <<endl;
 	return;
       }