merging updates

tahuang1991 · Aug 14, 2013 · 95e05c6 · 95e05c6
2 parents cf9f176 + 4c05ec6
commit 95e05c6
Show file tree

Hide file tree

Showing 15 changed files with 3,280 additions and 858 deletions.
diff --git a/GEMValidation/src/SimHitMatcher.cc b/GEMValidation/src/SimHitMatcher.cc
@@ -176,7 +176,7 @@ SimHitMatcher::matchSimHitsToSimTrack(std::vector<unsigned int> track_ids,
       if (h.trackId() != track_id) continue;
       int pdgid = h.particleType();
       if (simMuOnlyCSC_ && std::abs(pdgid) != 13) continue;
-      if (discardEleHitsCSC_ && pdgid == 11) continue;
+      if (discardEleHitsCSC_ && std::abs(pdgid == 11)) continue;
 
       csc_detid_to_hits_[ h.detUnitId() ].push_back(h);
       csc_hits_.push_back(h);
@@ -188,7 +188,7 @@ SimHitMatcher::matchSimHitsToSimTrack(std::vector<unsigned int> track_ids,
       if (h.trackId() != track_id) continue;
       int pdgid = h.particleType();
       if (simMuOnlyGEM_ && std::abs(pdgid) != 13) continue;
-      if (discardEleHitsGEM_ && pdgid == 11) continue;
+      if (discardEleHitsGEM_ && std::abs(pdgid == 11)) continue;
 
       gem_detid_to_hits_[ h.detUnitId() ].push_back(h);
       gem_hits_.push_back(h);

diff --git a/GEMValidation/test/runGEMDigiAnalyzer_cfg.py b/GEMValidation/test/runGEMDigiAnalyzer_cfg.py
@@ -1,19 +1,22 @@
 import FWCore.ParameterSet.Config as cms
 
-process = cms.Process("GEMANA")
+process = cms.Process("GEMDIGIANA")
 
+## Standard sequence
+process.load('Configuration.StandardSequences.Services_cff')
 process.load('FWCore.MessageService.MessageLogger_cfi')
+process.load('Configuration.Geometry.GeometryExtended2019Reco_cff')
+process.load('Configuration.Geometry.GeometryExtended2019_cff')
+process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff')
+process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
+
+## TrackingComponentsRecord required for matchers
+process.load('TrackPropagation.SteppingHelixPropagator.SteppingHelixPropagatorOpposite_cfi')
+process.load('TrackPropagation.SteppingHelixPropagator.SteppingHelixPropagatorAlong_cfi')
 
-#process.load('Geometry.GEMGeometry.cmsExtendedGeometryPostLS1plusGEMXML_cfi')
-process.load('Geometry.GEMGeometry.cmsExtendedGeometryPostLS1plusGEMr08v01XML_cfi')
-#process.load('Geometry.GEMGeometry.cmsExtendedGeometryPostLS1plusGEMr10v01XML_cfi')
-process.load('Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi')
-process.load('Geometry.CommonDetUnit.globalTrackingGeometry_cfi')
-process.load('Geometry.MuonNumbering.muonNumberingInitialization_cfi')
-process.load('Geometry.GEMGeometry.gemGeometry_cfi')
-process.load('Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometryDB_cff')
-process.load('Geometry.DTGeometryBuilder.idealForDigiDtGeometryDB_cff')
-process.load('Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff')
+## global tag for 2019 upgrade studies
+from Configuration.AlCa.GlobalTag import GlobalTag
+process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:upgrade2019', '')
 
 # the analyzer configuration
 process.load('GEMCode.GEMValidation.GEMDigiAnalyzer_cfi')
@@ -23,30 +26,17 @@
 process.GEMDigiAnalyzer.simTrackMatching.cscALCTInput = ""
 process.GEMDigiAnalyzer.simTrackMatching.cscLCTInput = ""
 
-process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
-process.GlobalTag.globaltag = 'POSTLS161_V12::All'
-
 process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(-1) )
 
 process.options = cms.untracked.PSet( wantSummary = cms.untracked.bool(True) )
 
-process.TFileService = cms.Service("TFileService",
-    fileName = cms.string("gem_digi_ana.root")
+process.source = cms.Source("PoolSource",
+  fileNames = cms.untracked.vstring("file:out_digi.root")
 )
 
-#dir_pt40 = '/pnfs/cms/WAX/11/store/user/lpcgem/yasser1/yasser/muonGun_50k_pT40_lpcgem/MuomGunPt40L1CSC50k_digi/82325e40d6202e6fec2dd983c477f3ca/'
-#inputDir = dir_pt40
-
-import os
-
-#ls = os.listdir(inputDir)
-
-process.source = cms.Source("PoolSource",
-    fileNames = cms.untracked.vstring(
-    #[inputDir[16:] + x for x in ls if x.endswith('root')]
-    'file:out_digi.root'
-    )
+process.TFileService = cms.Service("TFileService",
+    fileName = cms.string("gem_digi_ana.root")
 )
 
-process.p    = cms.Path(process.GEMDigiAnalyzer)
+process.p = cms.Path(process.GEMDigiAnalyzer)
 
diff --git a/GEMValidation/test/runGEMSimHitAnalyzer_cfg.py b/GEMValidation/test/runGEMSimHitAnalyzer_cfg.py
@@ -1,21 +1,23 @@
 import FWCore.ParameterSet.Config as cms
 
-process = cms.Process("Demo")
-
-process.load("FWCore.MessageService.MessageLogger_cfi")
-
-process.load('Geometry.GEMGeometry.cmsExtendedGeometryPostLS1plusGEMXML_cfi')
-#process.load('Geometry.GEMGeometry.cmsExtendedGeometryPostLS1plusGEMr08v01XML_cfi')
-#process.load('Geometry.GEMGeometry.cmsExtendedGeometryPostLS1plusGEMr10v01XML_cfi')
-process.load('Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi')
-process.load('Geometry.CommonDetUnit.globalTrackingGeometry_cfi')
-process.load('Geometry.MuonNumbering.muonNumberingInitialization_cfi')
-process.load('Geometry.GEMGeometry.gemGeometry_cfi')
+process = cms.Process("GEMSIMANA")
+
+## Standard sequence
+process.load('Configuration.StandardSequences.Services_cff')
+process.load('FWCore.MessageService.MessageLogger_cfi')
+process.load('Configuration.Geometry.GeometryExtended2019Reco_cff')
+process.load('Configuration.Geometry.GeometryExtended2019_cff')
+process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff')
+process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
 
-process.load('Configuration.StandardSequences.MagneticField_cff')
+## TrackingComponentsRecord required for matchers
 process.load('TrackPropagation.SteppingHelixPropagator.SteppingHelixPropagatorOpposite_cfi')
 process.load('TrackPropagation.SteppingHelixPropagator.SteppingHelixPropagatorAlong_cfi')
 
+## global tag for 2019 upgrade studies
+from Configuration.AlCa.GlobalTag import GlobalTag
+process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:upgrade2019', '')
+
 # the analyzer configuration
 process.load('GEMCode.GEMValidation.GEMSimHitAnalyzer_cfi')
 process.GEMSimHitAnalyzer.simTrackMatching.gemDigiInput = ""
@@ -27,34 +29,16 @@
 process.GEMSimHitAnalyzer.simTrackMatching.cscALCTInput = ""
 process.GEMSimHitAnalyzer.simTrackMatching.cscLCTInput = ""
 
-process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
-process.GlobalTag.globaltag = 'POSTLS161_V12::All'
 process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(1000) )
 
 process.options = cms.untracked.PSet( wantSummary = cms.untracked.bool(True) )
 
-## ff = open('filelist_minbias_61M.txt', "r")
-## pu_files = ff.read().split('\n')
-## ff.close()
-## pu_files = filter(lambda x: x.endswith('.root'),  pu_files)
-
-dir_pt40 = '/pnfs/cms/WAX/11/store/user/lpcgem/willhf/willhf/muonGun_50k_pT40_lpcgem/muonGun_50k_pT40_lpcgem/c25a99a3a5d3061319c1beac698b55b1/'
-
-inputDir = dir_pt40
-
-import os
-
-ls = os.listdir(inputDir)
-
 process.source = cms.Source("PoolSource",
-##    fileNames = cms.untracked.vstring(*pu_files)
-  fileNames = cms.untracked.vstring(
-    [inputDir[16:] + x for x in ls if x.endswith('root')]
-  )
+  fileNames = cms.untracked.vstring("file:out_sim.root")                            
 )
 
 process.TFileService = cms.Service("TFileService",
-  fileName = cms.string("gem_sh_ana.test.root")
+  fileName = cms.string("gem_sh_ana.root")
 )
 
 process.p = cms.Path(process.GEMSimHitAnalyzer)

diff --git a/README.md b/README.md
@@ -1,15 +1,23 @@
-GEMCode
-=======
+#GEMCode
 
-Introduction
-------------
+## Table of contents
+
+* [Introduction](#introduction)
+* [Documentation](#documentation)
+* [Instructions to get the code](#instructions-to-get-the-code)
+  * [General GitHub setup](#general-github-setup)
+  * [CMSSW environment setup](#cmssw-environment-setup)
+  * [Get the official CMSSW code](#get-the-official-cmssw-code)
+  * [Checking out and merging the latest GEM developments](#Checking-out-and-merging-the-latest-gem-developments)
+  * [Adding submodules](#adding-submodules)
+
+##Introduction
 
 This is the repository for code development of GEM the validation analyzer and the GEM-CSC integrated local trigger analyzer.<br><br>
 This README.md file can is encoded in MarkDown, see<br>
 http://daringfireball.net/projects/markdown/syntax
 
-Documentation
--------------
+##Documentation
 
 * Home page of validation page<br>
 https://twiki.cern.ch/twiki/bin/view/MPGD/GemSimulationsInstructionsCMSSW<br>
@@ -28,8 +36,7 @@ http://cms-project-gem-validation.web.cern.ch/cms-project-gem-validation/<br>
 https://twiki.cern.ch/twiki/bin/view/MPGD/GEMTriggerRoadMap
 
 
-Instructions to get the code
-----------------------------
+##Instructions to get the code
 
 ###General GitHub setup
 

diff --git a/SimMuL1/interface/Helpers.h b/SimMuL1/interface/Helpers.h
@@ -3,13 +3,13 @@
 
 namespace helpers
 {
-inline bool 
+bool
 isME1bEtaRegion(float eta, float eta_min = 1.64, float eta_max = 2.14)
 {
   return fabs(eta) >= eta_min && fabs(eta) <= eta_max;
 }
 
-inline bool
+bool
 isME1abEtaRegion(float eta, float eta_min = 1.64)
 {
   return fabs(eta) >= eta_min;