From 691e139b5715ac68c43e05e0483a7f65dc1d9392 Mon Sep 17 00:00:00 2001 From: William Badgett Jr Date: Sun, 25 Oct 2009 15:02:09 +0000 Subject: [PATCH] --- yaml --- r: 76271 b: "refs/heads/CMSSW_7_1_X" c: 7c9e1462040e035707b1b02dd273f7c26f6a70f4 h: "refs/heads/CMSSW_7_1_X" i: 76269: 6a436423a3efd26dd548add0e4ec4883c341150e 76267: 33df83d669df7e10bfe5e1b7f4135c182c77f31e 76263: 026a582703c964991ad5bda1cf6ef0a78da5402b 76255: 3cd5c878a26b3e3c9557b539bc6086af010140b2 v: v3 --- [refs] | 2 +- .../DataFormats/Scalers/interface/DcsStatus.h | 59 ++++++++-------- trunk/DataFormats/Scalers/src/BeamSpot.cc | 16 +++-- trunk/DataFormats/Scalers/src/DcsStatus.cc | 68 +++++++++++++++++++ trunk/DataFormats/Scalers/src/classes.h | 14 ++++ trunk/DataFormats/Scalers/src/classes_def.xml | 10 +++ 6 files changed, 134 insertions(+), 35 deletions(-) diff --git a/[refs] b/[refs] index a4eb61b5f1abf..13ac2da3e6648 100644 --- a/[refs] +++ b/[refs] @@ -1,3 +1,3 @@ --- refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e -"refs/heads/CMSSW_7_1_X": 105402fcbe7d18fd78c56583dfa284902cb65078 +"refs/heads/CMSSW_7_1_X": 7c9e1462040e035707b1b02dd273f7c26f6a70f4 diff --git a/trunk/DataFormats/Scalers/interface/DcsStatus.h b/trunk/DataFormats/Scalers/interface/DcsStatus.h index 036c96c33a295..86f6aba1fe751 100644 --- a/trunk/DataFormats/Scalers/interface/DcsStatus.h +++ b/trunk/DataFormats/Scalers/interface/DcsStatus.h @@ -29,36 +29,41 @@ class DcsStatus { public: + static const int partitionList[]; + static const char * partitionName[]; + enum { - EB_p = 0, - EB_minus = 1, - EE_plus = 2, - EE_minus = 3, - HBHEa = 5, - HBHEb = 6, - HBHEc = 7, - HF = 8, - HO = 9, - RPC = 12, - DT0 = 13, - DT_plus = 14, - DT_minus = 15, - CSC_plus = 16, - CSC_minus = 17, - DTTF = 18, - CSCTF = 19, - CASTOR = 20, - TIBTID = 24, - TOB = 25, - TEC_plus = 26, - TEC_minus = 27, - BPIX = 28, - FPIX = 29, - ES_plus = 30, - ES_minus = 31 + EBp = 0, + EBm = 1, + EEp = 2, + EEm = 3, + HBHEa = 5, + HBHEb = 6, + HBHEc = 7, + HF = 8, + HO = 9, + RPC = 12, + DT0 = 13, + DTp = 14, + DTm = 15, + CSCp = 16, + CSCm = 17, + DTTF = 18, + CSCTF = 19, + CASTOR = 20, + TIBTID = 24, + TOB = 25, + TECp = 26, + TECm = 27, + BPIX = 28, + FPIX = 29, + ESp = 30, + ESm = 31, + nPartitions = 26 }; + DcsStatus(); DcsStatus(const unsigned char * rawData); virtual ~DcsStatus(); @@ -80,7 +85,7 @@ class DcsStatus unsigned int ready() const { return(ready_);} bool ready(int partitionNumber) const - { return((ready_ & ( 1 << partitionNumber ) != 0 ));} + { return( (ready_ & ( 1 << partitionNumber )) != 0 );} /// equality operator int operator==(const DcsStatus& e) const { return false; } diff --git a/trunk/DataFormats/Scalers/src/BeamSpot.cc b/trunk/DataFormats/Scalers/src/BeamSpot.cc index a01c49bfed543..9655f55eabf55 100644 --- a/trunk/DataFormats/Scalers/src/BeamSpot.cc +++ b/trunk/DataFormats/Scalers/src/BeamSpot.cc @@ -92,17 +92,19 @@ std::ostream& operator<<(std::ostream& s, const BeamSpot& c) c.trigType(), c.eventID(), c.bunchNumber()); s << line << std::endl; - sprintf(line," x: %e +/- %e y: %e +/- %e z: %e +/- %e", - c.x(), c.err_x(), c.y(), c.err_y(), c.z(), c.err_z()); + sprintf(line," x: %e +/- %e width: %e +/- %e", + c.x(), c.err_x(), c.width_x(), c.err_width_x()); s << line << std::endl; - sprintf(line," width_x: %e +/- %e width_y: %e +/- %e sigma_z: %e +/- %e", - c.width_x(), c.err_width_x(), - c.width_y(), c.err_width_y(), - c.sigma_z(), c.err_sigma_z()); + sprintf(line," y: %e +/- %e width: %e +/- %e", + c.y(), c.err_y(), c.width_y(), c.err_width_y()); s << line << std::endl; - sprintf(line," dxdy: %e +/- %e dxdz: %e +/- %e", + sprintf(line," z: %e +/- %e sigma: %e +/- %e", + c.z(), c.err_z(), c.sigma_z(), c.err_sigma_z()); + s << line << std::endl; + + sprintf(line," dxdy: %e +/- %e dydz: %e +/- %e", c.dxdz(), c.err_dxdz(), c.dydz(), c.err_dydz()); s << line << std::endl; return s; diff --git a/trunk/DataFormats/Scalers/src/DcsStatus.cc b/trunk/DataFormats/Scalers/src/DcsStatus.cc index 1bda4e3f993b0..60803581f16fe 100644 --- a/trunk/DataFormats/Scalers/src/DcsStatus.cc +++ b/trunk/DataFormats/Scalers/src/DcsStatus.cc @@ -7,6 +7,62 @@ #include #include +const int DcsStatus::partitionList[DcsStatus::nPartitions] = { + EBp , + EBm , + EEp , + EEm , + HBHEa , + HBHEb , + HBHEc , + HF , + HO , + RPC , + DT0 , + DTp , + DTm , + CSCp , + CSCm , + DTTF , + CSCTF , + CASTOR , + TIBTID , + TOB , + TECp , + TECm , + BPIX , + FPIX , + ESp , + ESm }; + +const char * DcsStatus::partitionName[DcsStatus::nPartitions] = { + "EBp" , + "EBm" , + "EEp" , + "EEm" , + "HBHEa" , + "HBHEb" , + "HBHEc" , + "HF" , + "HO" , + "RPC" , + "DT0" , + "DTp" , + "DTm" , + "CSCp" , + "CSCm" , + "DTTF" , + "CSCTF" , + "CASTOR" , + "TIBTID" , + "TOB" , + "TECp" , + "TECm" , + "BPIX" , + "FPIX" , + "ESp" , + "ESm" }; + DcsStatus::DcsStatus() : trigType_(0), eventID_(0), @@ -65,5 +121,17 @@ std::ostream& operator<<(std::ostream& s, const DcsStatus& c) sprintf(line," Ready: %d 0x%8.8X", c.ready(), c.ready()); s << line << std::endl; + for ( int i=0; i w_l1AcceptBunchCrossing; edm::Wrapper w_l1TriggerScalers; @@ -29,6 +33,8 @@ namespace edm::Wrapper w_level1TriggerScalers; edm::Wrapper w_level1TriggerRates; edm::Wrapper w_lumiScalers; + edm::Wrapper w_dcsStatus; + edm::Wrapper w_beamSpot; edm::RefProd l1AcceptBunchCrossingRef ; edm::RefProd l1TriggerScalersRef ; @@ -36,6 +42,8 @@ namespace edm::RefProd level1TriggerScalersRef ; edm::RefProd level1TriggerRatesRef ; edm::RefProd lumiScalersRef ; + edm::RefProd dcsStatusRef ; + edm::RefProd beamSpotRef ; L1AcceptBunchCrossingCollection l1AcceptBunchCrossingCollection; edm::Wrapper @@ -55,5 +63,11 @@ namespace LumiScalersCollection lumiScalersCollection; edm::Wrapper w_lumiScalersCollection; + + DcsStatusCollection dcsStatusCollection; + edm::Wrapper w_dcsStatusCollection; + + BeamSpotCollection beamSpotCollection; + edm::Wrapper w_beamSpotCollection; }; } diff --git a/trunk/DataFormats/Scalers/src/classes_def.xml b/trunk/DataFormats/Scalers/src/classes_def.xml index ee657085793ff..c66ca56aed331 100644 --- a/trunk/DataFormats/Scalers/src/classes_def.xml +++ b/trunk/DataFormats/Scalers/src/classes_def.xml @@ -5,6 +5,8 @@ + + @@ -12,22 +14,30 @@ + + + + + + + +