Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bug fix: configured run range dependence was ignored in TkModuleGroupSel... #348

Merged
merged 1 commit into from
Aug 19, 2013
Merged

bug fix: configured run range dependence was ignored in TkModuleGroupSel... #348

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions Alignment/CommonAlignmentAlgorithm/src/TkModuleGroupSelector.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
*
* \author Joerg Behr
* \date May 2013
* $Revision: 1.4 $
* $Date: 2013/05/31 14:50:52 $
* $Revision: 1.5 $
* $Date: 2013/06/19 08:33:03 $
* (last update by $Author: jbehr $)
*/

Expand Down Expand Up @@ -270,17 +270,20 @@ int TkModuleGroupSelector::getParameterIndexFromDetId(unsigned int detId,
const std::vector<edm::RunNumber_t> &runs = runRange_.at(iAlignableGroup);
const unsigned int id0 = firstId_.at(iAlignableGroup);
const edm::RunNumber_t refrun = referenceRun_.at(iAlignableGroup);
// assuming runs is never empty (checked in createModuleGroups(..))
if (runs[0] > run) {
throw cms::Exception("BadConfig")
<< "@SUB=TkModuleGroupSelector::getParameterIndexFromDetId:\n"
<< "Run " << run << " not foreseen for detid ('"<< detId <<"')"
<< " in module group " << iAlignableGroup << ".";
}


unsigned int iovNum = 0;
for ( ; iovNum < runs.size(); ++iovNum) {
if (run >= runs[iovNum]) break;
if (runs[iovNum] > run) break;
}
if (iovNum == 0) {
throw cms::Exception("BadConfig") << "@SUB=TkModuleGroupSelector::getParameterIndexFromDetId:\n"
<< "Run " << run << " not foreseen for detid '"<< detId <<"'"
<< " in module group " << iAlignableGroup << ".";
} else {
--iovNum;
}

//test whether the iov contains the reference run
if(refrun > 0) { //if > 0 a reference run number has been provided
if(iovNum+1 == runs.size()) {
Expand Down