Skip to content

Commit

Permalink
orbit counter set in DCCHeaderBlock - needs DataFormats/EcalRawData V…
Browse files Browse the repository at this point in the history
…01-01-12
  • Loading branch information
Giovanni Franzoni committed Dec 4, 2007
1 parent 6a34ad3 commit 766b7ef
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 10 deletions.
12 changes: 7 additions & 5 deletions EventFilter/EcalTBRawToDigi/src/EcalTB07DaqFormatter.cc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*
* $Date: 2007/11/26 16:39:58 $
* $Revision: 1.19 $
* $Date: 2007/12/04 11:04:52 $
* $Revision: 1.20 $
* \author N. Marinelli IASA
* \author G. Della Ricca
* \author G. Franzoni
Expand Down Expand Up @@ -146,6 +146,8 @@ void EcalTB07DaqFormatter::interpretRawData(const FEDRawData & fedData ,
else{ edm::LogWarning("EcalTB07RawToDigiTriggerType") << "@SUB=EcalTB07DaqFormatter::interpretRawData"
<< "unrecognized TRIGGER TYPE: "<<trigger_type;}
theDCCheader.setLV1((*itEventBlock)->getDataField("LV1"));
// this needs V01-01-12 DataFormats/EcalRawData
theDCCheader.setOrbit((*itEventBlock)->getDataField("ORBIT COUNTER"));
theDCCheader.setBX((*itEventBlock)->getDataField("BX"));
theDCCheader.setErrors((*itEventBlock)->getDataField("DCC ERRORS"));
theDCCheader.setSelectiveReadout( sr );
Expand Down Expand Up @@ -235,11 +237,11 @@ void EcalTB07DaqFormatter::interpretRawData(const FEDRawData & fedData ,
std::cout << "tower " << i << " has status " << TowerStatus[i] << std::endl;
}
}
// this needs V01-01-11 DataFormats/EcalRawData
// theDCCheader.setFEStatus(theTTstatus);
// this needs V01-01-12 DataFormats/EcalRawData
theDCCheader.setFEStatus(theTTstatus);

// rolled back temporarily to develop in CMSSW_1_7_0
theDCCheader.setTriggerTowerStatus(theTTstatus);
//theDCCheader.setTriggerTowerStatus(theTTstatus);

EcalDCCTBHeaderRuntypeDecoder theRuntypeDecoder;
ulong DCCruntype = (*itEventBlock)->getDataField("RUN TYPE");
Expand Down
12 changes: 7 additions & 5 deletions EventFilter/EcalTBRawToDigi/src/EcalTBDaqFormatter.cc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*
* $Date: 2007/11/26 16:39:58 $
* $Revision: 1.66 $
* $Date: 2007/12/04 11:04:52 $
* $Revision: 1.67 $
* \author N. Marinelli IASA
* \author G. Della Ricca
* \author G. Franzoni
Expand Down Expand Up @@ -119,6 +119,8 @@ void EcalTBDaqFormatter::interpretRawData(const FEDRawData & fedData ,
else{ edm::LogWarning("EcalTBRawToDigiTriggerType") << "@SUB=EcalTBDaqFormatter::interpretRawData"
<< "unrecognized TRIGGER TYPE: "<<trigger_type;}
theDCCheader.setLV1((*itEventBlock)->getDataField("LV1"));
// this needs V01-01-12 DataFormats/EcalRawData
theDCCheader.setOrbit((*itEventBlock)->getDataField("ORBIT COUNTER"));
theDCCheader.setBX((*itEventBlock)->getDataField("BX"));
theDCCheader.setErrors((*itEventBlock)->getDataField("DCC ERRORS"));
theDCCheader.setSelectiveReadout( sr );
Expand Down Expand Up @@ -202,11 +204,11 @@ void EcalTBDaqFormatter::interpretRawData(const FEDRawData & fedData ,
theTTstatus.push_back(TowerStatus[i]);
//cout << "tower " << i << " has status " << TowerStatus[i] << endl;
}
// this needs V01-01-11 DataFormats/EcalRawData
// theDCCheader.setFEStatus(theTTstatus);
// this needs V01-01-12 DataFormats/EcalRawData
theDCCheader.setFEStatus(theTTstatus);

// rolled back temporarily to develop in CMSSW_1_7_0
theDCCheader.setTriggerTowerStatus(theTTstatus);
//theDCCheader.setTriggerTowerStatus(theTTstatus);

EcalDCCTBHeaderRuntypeDecoder theRuntypeDecoder;
ulong DCCruntype = (*itEventBlock)->getDataField("RUN TYPE");
Expand Down

0 comments on commit 766b7ef

Please sign in to comment.