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

Jump to bottom

Bugfix and new configuration for online DQM #4529

Merged
merged 1 commit into from Jul 8, 2014
Merged

Bugfix and new configuration for online DQM #4529

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion DQM/EcalMonitorClient/python/EcalCalibMonitorClient_cfi.py
View file
Open in desktop
Expand Up @@ -36,7 +36,7 @@
CalibrationSummaryClient = ecalCalibrationSummaryClient
),
commonParameters = ecalCommonParams,
PNMaskFile = cms.untracked.FileInPath("DQM/EcalMonitorClient/data/mask-PN.txt"),
# PNMaskFile = cms.untracked.FileInPath("DQM/EcalMonitorClient/data/mask-PN.txt"),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please do not comment code. Remove it if not needed anymore.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, I will take care of this soon. The PR was made in somewhat of a rush during the global run to get online DQM running..

verbosity = cms.untracked.int32(0)
)

3 changes: 2 additions & 1 deletion DQM/EcalMonitorClient/python/LaserClient_cfi.py
View file
Open in desktop
Expand Up @@ -28,7 +28,8 @@
tolerancePNRMSRatio = cms.untracked.double(tolerancePNRMSRatio),
expectedTiming = cms.untracked.vdouble(expectedTiming),
toleranceTiming = cms.untracked.double(toleranceTiming),
toleranceTimRMS = cms.untracked.double(toleranceTimRMS)
toleranceTimRMS = cms.untracked.double(toleranceTimRMS),
laserWavelengths = ecaldqmLaserWavelengths
),
sources = cms.untracked.PSet(
Timing = ecalLaserTask.MEs.Timing,
Expand Down
3 changes: 2 additions & 1 deletion DQM/EcalMonitorClient/python/LedClient_cfi.py
View file
Open in desktop
Expand Up @@ -28,7 +28,8 @@
tolerancePNRMSRatio = cms.untracked.double(tolerancePNRMSRatio),
expectedTiming = cms.untracked.vdouble(expectedTiming),
toleranceTiming = cms.untracked.double(toleranceTiming),
toleranceTimRMS = cms.untracked.double(toleranceTimRMS)
toleranceTimRMS = cms.untracked.double(toleranceTimRMS),
ledWavelengths = ecaldqmLedWavelengths
),
sources = cms.untracked.PSet(
Timing = ecalLedTask.MEs.Timing,
Expand Down
4 changes: 3 additions & 1 deletion DQM/EcalMonitorClient/python/PedestalClient_cfi.py
View file
Open in desktop
Expand Up @@ -20,7 +20,9 @@
toleranceRMS = cms.untracked.vdouble(toleranceRMS),
expectedPNMean = cms.untracked.double(expectedPNMean),
tolerancePNMean = cms.untracked.double(tolerancePNMean),
tolerancePNRMS = cms.untracked.vdouble(tolerancePNRMS)
tolerancePNRMS = cms.untracked.vdouble(tolerancePNRMS),
MGPAGains = ecaldqmMGPAGains,
MGPAGainsPN = ecaldqmMGPAGainsPN
),
sources = cms.untracked.PSet(
Pedestal = ecalPedestalTask.MEs.Pedestal,
Expand Down
15 changes: 9 additions & 6 deletions DQM/EcalMonitorClient/python/TestPulseClient_cfi.py
View file
Open in desktop
Expand Up @@ -11,12 +11,15 @@
tolerancePNRMS = [20., 20.]

ecalTestPulseClient = cms.untracked.PSet(
name = cms.untracked.string('TestPulseClient'),
minChannelEntries = cms.untracked.int32(minChannelEntries),
amplitudeThreshold = cms.untracked.vdouble(amplitudeThreshold),
toleranceRMS = cms.untracked.vdouble(toleranceRMS),
PNAmplitudeThreshold = cms.untracked.vdouble(PNAmplitudeThreshold),
tolerancePNRMS = cms.untracked.vdouble(tolerancePNRMS),
params = cms.untracked.PSet(
minChannelEntries = cms.untracked.int32(minChannelEntries),
amplitudeThreshold = cms.untracked.vdouble(amplitudeThreshold),
toleranceRMS = cms.untracked.vdouble(toleranceRMS),
PNAmplitudeThreshold = cms.untracked.vdouble(PNAmplitudeThreshold),
tolerancePNRMS = cms.untracked.vdouble(tolerancePNRMS),
MGPAGains = ecaldqmMGPAGains,
MGPAGainsPN = ecaldqmMGPAGainsPN
),
sources = cms.untracked.PSet(
Amplitude = ecalTestPulseTask.MEs.Amplitude,
PNAmplitude = ecalTestPulseTask.MEs.PNAmplitude
Expand Down
2 changes: 1 addition & 1 deletion DQM/EcalMonitorTasks/plugins/EcalDQMonitorTask.cc
View file
Open in desktop
Expand Up @@ -61,7 +61,7 @@ EcalDQMonitorTask::EcalDQMonitorTask(edm::ParameterSet const& _ps) :
if(hasTaskToRun[iCol])
dependencies.push_back(ecaldqm::Dependency(ecaldqm::Collections(iCol)));
}
if(collectionTags.existsAs<edm::InputTag>("EcalRawData"))
if(collectionTags.existsAs<edm::InputTag>("EcalRawData", false))
dependencies.push_back(ecaldqm::Dependency(ecaldqm::kEcalRawData));

formSchedule(dependencies.formSequence(), collectionTags);
Expand Down
4 changes: 3 additions & 1 deletion DQM/EcalMonitorTasks/python/LaserTask_cfi.py
View file
Open in desktop
Expand Up @@ -33,7 +33,9 @@
otype = cms.untracked.string('Ecal2P'),
btype = cms.untracked.string('DCC'),
description = cms.untracked.string('Fraction of laser events with measurable laser pulse.'),
multi = cms.untracked.int32(4)
multi = cms.untracked.PSet(
wl = ecaldqmLaserWavelengths
)
),
Shape = cms.untracked.PSet(
multi = cms.untracked.PSet(
Expand Down
8 changes: 6 additions & 2 deletions DQM/EcalMonitorTasks/python/LedTask_cfi.py
View file
Open in desktop
Expand Up @@ -33,7 +33,9 @@
otype = cms.untracked.string('EE'),
btype = cms.untracked.string('DCC'),
description = cms.untracked.string('Fraction of laser events with measurable led pulse.'),
multi = cms.untracked.int32(2)
multi = cms.untracked.PSet(
wl = ecaldqmLedWavelengths
)
),
Shape = cms.untracked.PSet(
multi = cms.untracked.PSet(
Expand Down Expand Up @@ -83,7 +85,9 @@
AmplitudeSummary = cms.untracked.PSet(
path = cms.untracked.string('EcalEndcap/EELedTask/Led%(wl)s/EELDT amplitude map L%(wl)s%(suffix)s'),
otype = cms.untracked.string('EE2P'),
multi = cms.untracked.int32(4),
multi = cms.untracked.PSet(
wl = ecaldqmLedWavelengths
),
kind = cms.untracked.string('TProfile2D'),
btype = cms.untracked.string('SuperCrystal'),
description = cms.untracked.string('2D distribution of the mean led amplitude. In general, a channel is filled only when a led pulse was observed in it. When no led signal was observed for longer than ' + str(emptyLSLimit) + ' lumi sections, the channels start to get filled with 0 amplitude, causing the mean to drop.')
Expand Down
34 changes: 17 additions & 17 deletions DQM/EcalMonitorTasks/src/PNDiodeTask.cc
View file
Open in desktop
Expand Up @@ -17,15 +17,15 @@ namespace ecaldqm {

for(int iDCC(0); iDCC < 54; iDCC++){
if(_runType[iDCC] == EcalDCCHeaderBlock::LASER_STD ||
_runType[iDCC] == EcalDCCHeaderBlock::LASER_GAP ||
_runType[iDCC] == EcalDCCHeaderBlock::LASER_GAP ||
_runType[iDCC] == EcalDCCHeaderBlock::LED_STD ||
_runType[iDCC] == EcalDCCHeaderBlock::LED_GAP ||
_runType[iDCC] == EcalDCCHeaderBlock::TESTPULSE_MGPA ||
_runType[iDCC] == EcalDCCHeaderBlock::TESTPULSE_GAP ||
_runType[iDCC] == EcalDCCHeaderBlock::TESTPULSE_MGPA ||
_runType[iDCC] == EcalDCCHeaderBlock::TESTPULSE_GAP ||
_runType[iDCC] == EcalDCCHeaderBlock::PEDESTAL_STD ||
_runType[iDCC] == EcalDCCHeaderBlock::PEDESTAL_GAP){
enable = true;
enable_[iDCC] = true;
_runType[iDCC] == EcalDCCHeaderBlock::PEDESTAL_GAP){
enable = true;
enable_[iDCC] = true;
}
else
enable_[iDCC] = false;
Expand Down Expand Up @@ -59,8 +59,8 @@ namespace ecaldqm {
}

std::for_each(_ids.begin(), _ids.end(), [&](EcalElectronicsIdCollection::value_type const& id){
set->fill(EcalElectronicsId(id.dccId(), id.towerId(), 1, id.xtalId()));
});
set->fill(EcalElectronicsId(id.dccId(), id.towerId(), 1, id.xtalId()));
});
}

void
Expand All @@ -71,18 +71,18 @@ namespace ecaldqm {
MESet& mePedestal(MEs_.at("Pedestal"));

std::for_each(_digis.begin(), _digis.end(), [&](EcalPnDiodeDigiCollection::value_type const& digi){
const EcalPnDiodeDetId& id(digi.id());
const EcalPnDiodeDetId& id(digi.id());

if(!enable_[dccId(id) - 1]) return;
if(!enable_[dccId(id) - 1]) return;

meOccupancy.fill(id);
meOccupancySummary.fill(id);
meOccupancy.fill(id);
meOccupancySummary.fill(id);

for(int iSample(0); iSample < 4; iSample++){
if(digi.sample(iSample).gainId() != 1) break;
mePedestal.fill(id, double(digi.sample(iSample).adc()));
}
});
for(int iSample(0); iSample < 4; iSample++){
if(digi.sample(iSample).gainId() != 1) break;
mePedestal.fill(id, double(digi.sample(iSample).adc()));
}
});
}

DEFINE_ECALDQM_WORKER(PNDiodeTask);
Expand Down