Back out ROOT6 specific change from ROOT 5 release

[wmtan]

This PR fixes the compilation errors in DPGAnalysis/SiStripTools in CMSSW_7_5_ROOT5_X.
It backs out a ROOT6 specific change, and corrects the name of a misspelled function.

[cmsbuild]

A new Pull Request was created by @wmtan for CMSSW_7_5_ROOT5_X.

Back out ROOT6 specific change from ROOT 5 rlease

It involves the following packages:

DPGAnalysis/SiStripTools

@cmsbuild, @vadler, @monttj can you please review it and eventually sign? Thanks.
@threus, @venturia this is something you requested to watch as well.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.
If you are a L2 or a release manager you can ask for tests by saying 'please test' in the first line of a comment.

[Dr15Jones]

please test

[cmsbuild]

The tests are being triggered in jenkins.

[cmsbuild]

-1
Tested at: 5215477
I found an error when building:

>> Leaving Package FWCore/Version
>> Package FWCore/Version built
>> Subsystem FWCore built
/afs/cern.ch/cms/sw/ReleaseCandidates/volB/slc6_amd64_gcc491/external/gcc/4.9.1-cms/bin/../lib/gcc/x86_64-redhat-linux-gnu/4.9.1/../../../../x86_64-redhat-linux-gnu/bin/ld: cannot find -lDataFormatsLuminosity
/afs/cern.ch/cms/sw/ReleaseCandidates/volB/slc6_amd64_gcc491/external/gcc/4.9.1-cms/bin/../lib/gcc/x86_64-redhat-linux-gnu/4.9.1/../../../../x86_64-redhat-linux-gnu/bin/ld: cannot find -lDataFormatsPatCandidates
collect2: error: ld returned 1 exit status
gmake: **\* [tmp/slc6_amd64_gcc491/src/DPGAnalysis/SiStripTools/src/DPGAnalysisSiStripTools/libDPGAnalysisSiStripTools.so] Error 1
Leaving library rule at DPGAnalysis/SiStripTools
>> Building shared library tmp/slc6_amd64_gcc491/src/DPGAnalysis/SiStripTools/bin/DPGAnalysisSiStripToolsMacros/libDPGAnalysisSiStripToolsMacros.so
>> Building capability library tmp/slc6_amd64_gcc491/src/DPGAnalysis/SiStripTools/src/DPGAnalysisSiStripTools/libDPGAnalysisSiStripToolsCapabilities.so
/afs/cern.ch/cms/sw/ReleaseCandidates/volB/slc6_amd64_gcc491/external/gcc/4.9.1-cms/bin/../lib/gcc/x86_64-redhat-linux-gnu/4.9.1/../../../../x86_64-redhat-linux-gnu/bin/ld: cannot find -lDPGAnalysisSiStripTools


you can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-10139/51/summary.html

[wmtan]

@cmsbuild This build error is not caused by this PR, but is already in the base. The build errors in question were already fixed in CMSSW_7_5_ROOT5_X by the merging of PR #9995 from 7_5_X, which was already done but is not yet in an IB. Apparently, you are testing using the latest IB (CMSSW_7_5_ROOT5_X_2015-07-09-2300) and not the head of the branch. As the IB was built before #9995 was merged, you still get the errors fixed by #9995.