Merge branch 'master' of https://github.com/BaylorCMS/HcalRelVal into…

… relval_update_May09_2015

Conflicts:
	.gitignore
	DQMOffline/Hcal/python/HcalDQMOfflinePostProcessor_cff.py
	DQMOffline/Hcal/src/HcalRecHitsAnalyzer.cc
	Validation/CaloTowers/test/macros/InputRelVal_High.txt
	Validation/CaloTowers/test/macros/InputRelVal_Low.txt
	Validation/CaloTowers/test/macros/InputRelVal_Medium.txt
	Validation/CaloTowers/test/macros/InputRelVal_Pileup.txt
	Validation/CaloTowers/test/macros/RelValMacro.C
	Validation/CaloTowers/test/macros/RunRVMacros.csh
	Validation/CaloTowers/test/macros/RunRVMacros_Pileup.csh
	Validation/CaloTowers/test/macros/SinglePi.C
	Validation/CaloTowers/test/macros/html_indices/SinglePiScan.html
	Validation/CaloTowers/test/macros/rootlogon.C
	Validation/CaloTowers/test/run_onRelVal_data_cfg.py
	Validation/HcalRecHits/src/HcalRecHitsValidation.cc

.gitignore

@@ -1,6 +1,207 @@
+<<<<<<< HEAD
 __init__.py
 *.pyc
 .*.swp
 .#*
 #*#
 *~
+=======
+#Binary and Image
+*.exe
+*.png
+*.jpg
+*.gif
+*.bmp
+*.pdf
+*.ps
+*.jpeg
+*.eps
+
+#condor log files
+*.log
+*.stderr
+*.stdout
+
+#Root
+*.root
+
+#Network File System
+.nfs*
+
+##Github EMACS Ignore
+*~
+\#*\#
+/.emacs.desktop
+/.emacs.desktop.lock
+.elc
+auto-save-list
+tramp
+.\#*
+# Org-mode
+.org-id-locations
+*_archive
+##Github VIM Ignore
+*.s[a-w][a-z]
+*.un~
+Session.vim
+.netrwhist
+*~
+
+##Github SVN Ignore
+.svn/
+
+##Github CVS Ignore
+/CVS/*
+*/CVS/*
+.cvsignore
+*/.cvsignore
+
+##Github Linux Ignore
+.*
+!.gitignore
+*~
+##Github OSX Ignore
+.DS_Store
+.AppleDouble
+.LSOverride
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes
+
+##Github Archives Ignore
+# It's better to unpack these files and commit the raw source because
+# git has its own built in compression methods.
+*.7z
+*.jar
+*.rar
+*.zip
+*.gz
+*.bzip
+*.bz2
+*.xz
+*.lzma
+
+#packing-only formats
+*.iso
+*.tar
+
+#package management formats
+*.dmg
+*.xpi
+*.gem
+*.egg
+*.deb
+*.rpm
+
+##Github Python Ignore
+*.py[cod]
+
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib
+lib64
+__pycache__
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+nosetests.xml
+
+# Translations
+*.mo
+
+# Mr Developer
+.mr.developer.cfg
+.project
+.pydevproject
+
+##Github C++ ignore
+# Compiled Object files
+*.slo
+*.lo
+*.o
+
+# Dependency Files
+*.d
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+
+##Github LaTeX Ignore
+*.acn
+*.acr
+*.alg
+*.aux
+*.bbl
+*.blg
+*.dvi
+*.fdb_latexmk
+*.glg
+*.glo
+*.gls
+*.idx
+*.ilg
+*.ind
+*.ist
+*.lof
+*.log
+*.lot
+*.maf
+*.mtc
+*.mtc0
+*.nav
+*.nlo
+*.out
+*.pdfsync
+*.ps
+*.snm
+*.synctex.gz
+*.toc
+*.vrb
+*.xdy
+*.tdo
+
+##Github Perl Ignore
+blib/
+.build/
+_build/
+cover_db/
+inc/
+Build
+!Build/
+Build.bat
+.last_cover_stats
+Makefile.old
+MANIFEST.bak
+META.yml
+MYMETA.yml
+nytprof.out
+pm_to_blib
+>>>>>>> 7e31176079b370f66dcb23abf71f2a14db206ca1

DQMOffline/Hcal/python/HcalDQMOfflinePostProcessor_cff.py

@@ -4,6 +4,5 @@
 from DQMOffline.Hcal.HcalNoiseRatesClient_cfi import *
 from DQMOffline.Hcal.CaloTowersDQMClient_cfi import *
 
-#HcalDQMOfflinePostProcessor = cms.Sequence(hcalNoiseRatesClient*hcalRecHitsDQMClient*calotowersDQMClient)
-HcalDQMOfflinePostProcessor = cms.Sequence(hcalNoiseRatesClient*calotowersDQMClient)
-
+HcalDQMOfflinePostProcessor = cms.Sequence(hcalNoiseRatesClient*hcalRecHitsDQMClient*calotowersDQMClient)
+#HcalDQMOfflinePostProcessor = cms.Sequence(hcalNoiseRatesClient*calotowersDQMClient)

DQMOffline/Hcal/src/HcalRecHitsAnalyzer.cc

@@ -1250,11 +1250,11 @@ void HcalRecHitsAnalyzer::fillRecHitsTmp(int subdet_, edm::Event const& ev){
       int stwd    = j->flags();
       int auxstwd = j->aux();
 
-      int serivityLevel = hcalSevLvl( (CaloRecHit*) &*j );
+      int severityLevel = hcalSevLvl( (CaloRecHit*) &*j );
       if( cell.subdet()==HcalBarrel ){
-         hcalHBSevLvlVec.push_back(serivityLevel);
+         hcalHBSevLvlVec.push_back(severityLevel);
       }else if (cell.subdet()==HcalEndcap ){
-         hcalHESevLvlVec.push_back(serivityLevel);
+         hcalHESevLvlVec.push_back(severityLevel);
       } 
 
       if((iz > 0 && eta > 0.) || (iz < 0 && eta <0.) || iz == 0) { 
@@ -1298,9 +1298,9 @@ void HcalRecHitsAnalyzer::fillRecHitsTmp(int subdet_, edm::Event const& ev){
       int stwd     = j->flags();
       int auxstwd  = j->aux();
 
-      int serivityLevel = hcalSevLvl( (CaloRecHit*) &*j );
+      int severityLevel = hcalSevLvl( (CaloRecHit*) &*j );
       if( cell.subdet()==HcalForward ){
-         hcalHFSevLvlVec.push_back(serivityLevel);
+         hcalHFSevLvlVec.push_back(severityLevel);
       } 
 
       if((iz > 0 && eta > 0.) || (iz < 0 && eta <0.) || iz == 0) { 
@@ -1343,9 +1343,9 @@ void HcalRecHitsAnalyzer::fillRecHitsTmp(int subdet_, edm::Event const& ev){
       int stwd     = j->flags();
       int auxstwd  = j->aux();
 
-      int serivityLevel = hcalSevLvl( (CaloRecHit*) &*j );
+      int severityLevel = hcalSevLvl( (CaloRecHit*) &*j );
       if( cell.subdet()==HcalOuter ){
-         hcalHOSevLvlVec.push_back(serivityLevel);
+         hcalHOSevLvlVec.push_back(severityLevel);
       } 
 
       if((iz > 0 && eta > 0.) || (iz < 0 && eta <0.) || iz == 0) { 

README.md

@@ -0,0 +1,2 @@
+# HcalRelVal
+HCAL Relval related chunk of CMSSW.

Validation/CaloTowers/test/macros/Makefile

@@ -0,0 +1,9 @@
+GCC=g++ -g `root-config --cflags --glibs` $< -o $@
+
+all : singlePi.exe RelValMacro.exe
+
+singlePi.exe : SinglePi.C
+	$(GCC)
+
+RelValMacro.exe : RelValMacro.C
+	$(GCC)