orbit counter set in DCCHeaderBlock - needs DataFormats/EcalRawData V…

…01-01-12
cms-sw · Dec 4, 2007 · 766b7ef · 766b7ef
1 parent 6a34ad3
commit 766b7ef
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/EventFilter/EcalTBRawToDigi/src/EcalTB07DaqFormatter.cc b/EventFilter/EcalTBRawToDigi/src/EcalTB07DaqFormatter.cc
@@ -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
@@ -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 );
@@ -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");

diff --git a/EventFilter/EcalTBRawToDigi/src/EcalTBDaqFormatter.cc b/EventFilter/EcalTBRawToDigi/src/EcalTBDaqFormatter.cc
@@ -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
@@ -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 );
@@ -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");