Author: [log in to unmask] Date: Tue Feb 24 16:40:49 2015 New Revision: 2194 Log: Add convenience methods for getting ECAL or SVT combined conditions. Modified: java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java Modified: java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java ============================================================================= --- java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java (original) +++ java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java Tue Feb 24 16:40:49 2015 @@ -23,8 +23,10 @@ import org.hps.conditions.api.ConditionsRecord; import org.hps.conditions.api.ConditionsRecord.ConditionsRecordCollection; import org.hps.conditions.api.ConditionsSeries; +import org.hps.conditions.ecal.EcalConditions; import org.hps.conditions.ecal.EcalConditionsConverter; import org.hps.conditions.ecal.TestRunEcalConditionsConverter; +import org.hps.conditions.svt.SvtConditions; import org.hps.conditions.svt.SvtConditionsConverter; import org.hps.conditions.svt.SvtDetectorSetup; import org.hps.conditions.svt.TestRunSvtConditionsConverter; @@ -634,6 +636,14 @@ return conditionsRecords; } + public EcalConditions getEcalConditions() { + return this.getCachedConditions(EcalConditions.class, "ecal_conditions").getCachedData(); + } + + public SvtConditions getSvtConditions() { + return this.getCachedConditions(SvtConditions.class, "svt_conditions").getCachedData(); + } + /** * This method can be called to "freeze" the conditions system so that * any subsequent updates to run number or detector name will be ignored.