---

yaml
---
r: 46366
b: "refs/heads/CMSSW_7_1_X"
c: 025f3c6
h: "refs/heads/CMSSW_7_1_X"
v: v3

[refs]

@@ -1,3 +1,3 @@
 ---
 refs/heads/gh-pages: ac155dadd83efa75cad55c0508a57a2b9dd3d66c
-"refs/heads/CMSSW_7_1_X": 1a2d55d895e7a129fb610dd65c15b7b0fb9d8b45
+"refs/heads/CMSSW_7_1_X": 025f3c6215e01f239b73a7d8cca03200d043b855

trunk/DQM/RPCMonitorDigi/interface/RPCEfficiencyFromTrack.h

@@ -48,7 +48,7 @@ class RPCEfficiencyFromTrack : public edm::EDAnalyzer {
       virtual void analyze(const edm::Event&, const edm::EventSetup&);
       virtual void endJob() ;
       typedef std::vector<Trajectory> Trajectories;
-      std::map<std::string, MonitorElement*> bookDetUnitTrackEff(RPCDetId & detId);
+      std::map<std::string, MonitorElement*> bookDetUnitTrackEff(RPCDetId & detId, const edm::EventSetup & iSetup);
 
    private:
 
@@ -65,13 +65,6 @@ class RPCEfficiencyFromTrack : public edm::EDAnalyzer {
       int EffSaveRootFileEventsInterval;
       int DTTrigValue;
 
-      TH1F* EXPGlob1;  TH1F* EXPGlob2;  TH1F* EXPGlob3;  TH1F* EXPGlob4;  TH1F* EXPGlob5; 
-      TH1F* RPCGlob1;  TH1F* RPCGlob2;  TH1F* RPCGlob3;  TH1F* RPCGlob4;  TH1F* RPCGlob5; 
-
-
-      TH2F* ExtrapErrorG;TH2F* ExtrapErrorN; 
-      TH1F* chisquareEff;TH1F* chisquareNoEff;
-      TH1F* ChiEff;
 
       int wh;
       bool cosmic;

trunk/DQM/RPCMonitorDigi/src/RPCBookDetUnitTrackEff.cc

@@ -15,13 +15,14 @@
 #include <string>
 #include <map>
 
-
 #include <DataFormats/MuonDetId/interface/RPCDetId.h>
 #include "DQM/RPCMonitorDigi/interface/RPCEfficiencyFromTrack.h"
 #include "Geometry/RPCGeometry/interface/RPCGeomServ.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
+#include <Geometry/RPCGeometry/interface/RPCGeometry.h>
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
 
-std::map<std::string, MonitorElement*> RPCEfficiencyFromTrack::bookDetUnitTrackEff(RPCDetId & detId) {
+std::map<std::string, MonitorElement*> RPCEfficiencyFromTrack::bookDetUnitTrackEff(RPCDetId & detId, const edm::EventSetup & iSetup) {
 
   std::map<std::string, MonitorElement*> meMap;
   std::string regionName;
@@ -42,9 +43,26 @@ std::map<std::string, MonitorElement*> RPCEfficiencyFromTrack::bookDetUnitTrackE
 
   dbe->setCurrentFolder(folder);
 
+
+  int strips = 0; double lastvalue = 0.;
+
+
+
+
+  edm::ESHandle<RPCGeometry> rpcgeo;
+  iSetup.get<MuonGeometryRecord>().get(rpcgeo);
+
+  const RPCRoll * rpcRoll = rpcgeo->roll(detId);
+  strips = rpcRoll->nstrips();
+
+  if(strips == 0 ) strips = 1;
+  lastvalue=(double)strips+0.5;
+
+
   RPCGeomServ RPCname(detId);
   std::string nameRoll = RPCname.name();
 
+
   char detUnitLabel[128];
   char layerLabel[128];
 
@@ -57,39 +75,19 @@ std::map<std::string, MonitorElement*> RPCEfficiencyFromTrack::bookDetUnitTrackE
   //Begin booking
   sprintf(meId,"ExpectedOccupancyFromTrack_%s",detUnitLabel);
   sprintf(meTitle,"ExpectedOccupancyFromTrack_for_%s",layerLabel);
-  meMap[meId] = dbe->book1D(meId, meTitle, 100, 0.5, 100.5);
-
-  sprintf(meId,"RealDetectedOccupancy_%s",detUnitLabel);
-  sprintf(meTitle,"RealDetectedOccupancy_for_%s",layerLabel);
-  meMap[meId] = dbe->book1D(meId, meTitle, 100, 0.5, 100.5);
+  meMap[meId] = dbe->book1D(meId, meTitle, strips, 0.5, lastvalue);
 
   sprintf(meId,"RPCDataOccupancy_%s",detUnitLabel);
   sprintf(meTitle,"RPCDataOccupancy_for_%s",layerLabel);
-  meMap[meId] = dbe->book1D(meId, meTitle, 100, 0.5, 100.5);
+  meMap[meId] = dbe->book1D(meId, meTitle, strips, 0.5, lastvalue);
 
   sprintf(meId,"Residuals_%s",detUnitLabel);
   sprintf(meTitle,"Residuals_for_%s",layerLabel);
-  meMap[meId] = dbe->book1D(meId, meTitle, 100,-49.5, 49.);
-
-  sprintf(meId,"LocalPull_%s",detUnitLabel);
-  sprintf(meTitle,"LocalPull_for_%s",layerLabel);
-  meMap[meId] = dbe->book1D(meId, meTitle, 100,-49.5, 49.);
-
-  sprintf(meId,"Residuals_VS_RecPt_%s",detUnitLabel);
-  sprintf(meTitle,"Residuals_VS_RecPt_for_%s",layerLabel);
-  meMap[meId] = dbe->book2D(meId, meTitle, 100, 0.5, 100.5,100,-49.5,49.5);
+  meMap[meId] = dbe->book1D(meId, meTitle, 150,-49.5, 49.);
 
   sprintf(meId,"EfficienyFromTrackExtrapolation_%s",detUnitLabel);
   sprintf(meTitle,"EfficienyFromTrackExtrapolation_for_%s",layerLabel);
-  meMap[meId] = dbe->book1D(meId, meTitle, 100, 0.5, 100.5);
-
-  sprintf(meId,"2DExtrapolation_%s",detUnitLabel);
-  sprintf(meTitle,"2DExtrapolation_for_%s",layerLabel);
-  meMap[meId] = dbe->book2D(meId, meTitle, 401, -200.5, 200.5,201,-100.5,100.5);
-
-  sprintf(meId,"PredictedImpactPoint_%s",detUnitLabel);
-  sprintf(meTitle,"PredictedImpactPoint_for_%s",layerLabel);
-  meMap[meId] = dbe->book2D(meId, meTitle, 401, -200.5, 200.5,201,-100.5,100.5);
+  meMap[meId] = dbe->book1D(meId, meTitle, strips, 0.5, lastvalue);
 
   sprintf(meId,"ClusterSize_%s",detUnitLabel);
   sprintf(meTitle,"ClusterSize_for_%s",layerLabel);
@@ -99,9 +97,5 @@ std::map<std::string, MonitorElement*> RPCEfficiencyFromTrack::bookDetUnitTrackE
   sprintf(meTitle,"BunchX_for_%s",layerLabel);
   meMap[meId] = dbe->book1D(meId, meTitle,13,-6.5,6.5);
 
-  sprintf(meId,"Residuals_VS_CLsize_%s",detUnitLabel);
-  sprintf(meTitle,"Residuals_CLsize_for_%s",layerLabel);
-  meMap[meId] = dbe->book2D(meId, meTitle, 10, 0.5, 10.5,100,-49.5,49.5);
-
   return meMap;
 }