From 539c985aaf809bf98686290921083e82bd4c925e Mon Sep 17 00:00:00 2001
From: Gianluca Cerminara
 <sha1-e069a525311dcccf7987d451d144560439d7b950@cern.ch>
Date: Mon, 6 Apr 2009 16:28:50 +0000
Subject: [PATCH] --- yaml --- r: 64379 b: "refs/heads/CMSSW_7_1_X" c:
 85d355fd72a43407dfefcd5f63fe9611e0d51e4c h: "refs/heads/CMSSW_7_1_X" i:  
 64377: 42325885526daffd68fbac5ef445e275c637cd6f   64375:
 ef4e534c379fa257d92c2861a952dccb8bdc407d v: v3

---
 [refs]                                        |  2 +-
 .../DTRawToDigi/plugins/DTROS25Unpacker.cc    | 41 +++++++++++--------
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 5a22aca965200..e4334dbfbc52a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,3 +1,3 @@
 ---
 refs/heads/gh-pages: 82f76fd1a3f5d9423d7c163d852a0c36647fc4ea
-"refs/heads/CMSSW_7_1_X": 7f54a8addddda0243c41a6526b7c64628f9d0f18
+"refs/heads/CMSSW_7_1_X": 85d355fd72a43407dfefcd5f63fe9611e0d51e4c
diff --git a/trunk/EventFilter/DTRawToDigi/plugins/DTROS25Unpacker.cc b/trunk/EventFilter/DTRawToDigi/plugins/DTROS25Unpacker.cc
index 26b4e606b228c..5895a3ab2248e 100644
--- a/trunk/EventFilter/DTRawToDigi/plugins/DTROS25Unpacker.cc
+++ b/trunk/EventFilter/DTRawToDigi/plugins/DTROS25Unpacker.cc
@@ -1,7 +1,7 @@
 /** \file
  *
- *  $Date: 2008/12/19 13:39:45 $
- *  $Revision: 1.10 $
+ *  $Date: 2009/04/03 13:53:46 $
+ *  $Revision: 1.11 $
  *  \author  M. Zanetti - INFN Padova
  *  \revision FRC 060906
  */
@@ -261,18 +261,22 @@ void DTROS25Unpacker::interpretRawData(const unsigned int* index, int datasize,
 	// Check the eventual Sector Collector Header
 	else if (DTROSWordType(word).type() == DTROSWordType::SCHeader) {
 	  DTLocalTriggerHeaderWord scHeaderWord(word);
-	  if (debug) cout<<"[DTROS25Unpacker]: SCHeader  eventID "<<scHeaderWord.eventID()<<endl;
+	  if (debug) cout<<"[DTROS25Unpacker]: SC header  eventID " << scHeaderWord.eventID()<<endl;
 
 	  // RT added : first word following SCHeader is a SC private header
 	  wordCounter++; word = index[swap(wordCounter)];
 
-	  if(DTROSWordType(word).type() == DTROSWordType::SCData){
+	  if(DTROSWordType(word).type() == DTROSWordType::SCData) {
 	    DTLocalTriggerSectorCollectorHeaderWord scPrivateHeaderWord(word);
+	    
+	    if(performDataIntegrityMonitor) {
+	      controlData.addSCPrivHeader(scPrivateHeaderWord);
+	    }
 
 	    int numofscword = scPrivateHeaderWord.NumberOf16bitWords();
 	    int leftword = numofscword;
 
-	    if(debug) cout<<"[DTROS25Unpacker]: SCPrivateHeader (number of data + subheader = "
+	    if(debug) cout<<"                   SC PrivateHeader (number of words + subheader = "
 			  << scPrivateHeaderWord.NumberOf16bitWords() << ")" <<endl;
 
 	    // if no SC data -> no loop ;
@@ -280,7 +284,7 @@ void DTROS25Unpacker::interpretRawData(const unsigned int* index, int datasize,
 	    if(numofscword > 0){
 
 	      int bx_received = (numofscword - 1) / 2;
-	      if(debug)  cout<<"[DTROS25Unpacker]: number of bx " << bx_received << endl;
+	      if(debug)  cout<<"                   SC number of bx read-out: " << bx_received << endl;
 
 	      wordCounter++; word = index[swap(wordCounter)];
 	      if (DTROSWordType(word).type() == DTROSWordType::SCData) {
@@ -290,12 +294,12 @@ void DTROS25Unpacker::interpretRawData(const unsigned int* index, int datasize,
 		DTLocalTriggerSectorCollectorSubHeaderWord scPrivateSubHeaderWord(word);
 		// read the event BX in the SC header (will be stored in SC digis)
 		int scEventBX = scPrivateSubHeaderWord.LocalBunchCounter();
-		if(debug) cout <<"[DTROS25Unpacker]: SC trigger delay = "
+		if(debug) cout <<"                   SC trigger delay = "
 				<< scPrivateSubHeaderWord.TriggerDelay() << endl
-				<<"[DTROS25Unpacker]: SC bunch counter = "
+				<<"                   SC bunch counter = "
 				<< scEventBX << endl;
 		
-
+		controlData.addSCPrivSubHeader(scPrivateSubHeaderWord);
 
 		// actual loop on SC time slots
 		int stationGroup=0;
@@ -347,9 +351,8 @@ void DTROS25Unpacker::interpretRawData(const unsigned int* index, int datasize,
 			DTChamberId chamberId (SCwheel,SCstation,SCsector);
 			triggerProduct->insertDigi(chamberId,localtrigger);
 			if (debug) { 
-			  cout<<"FRC: just put in triggerProduct: "<<chamberId.wheel()
-			      <<" "<<chamberId.station()<<" "<<chamberId.sector()
-			      <<endl;;
+			  cout<<"Add SC digi to the collection, for chamber: " << chamberId
+			      <<endl;
 			  localtrigger.print(); }
 		      }
 		      if ( scDataWord.hasTrigger(1) || (scDataWord.getBits(1) & 0x30) ) {
@@ -362,10 +365,8 @@ void DTROS25Unpacker::interpretRawData(const unsigned int* index, int datasize,
 			DTChamberId chamberId (SCwheel,SCstation,SCsector);
 			triggerProduct->insertDigi(chamberId,localtrigger);
 			if(debug) { 
-			  cout <<"FRC: just put in triggerProduct: "
-			       <<chamberId.wheel()<<" "<<chamberId.station()
-			       <<" "<<chamberId.sector()
-			       <<endl;;
+			  cout<<"Add SC digi to the collection, for chamber: " << chamberId
+			      <<endl;
 			  localtrigger.print();
 			}
 		      }
@@ -381,8 +382,12 @@ void DTROS25Unpacker::interpretRawData(const unsigned int* index, int datasize,
 
 	  if (DTROSWordType(word).type() == DTROSWordType::SCTrailer) {
 	    DTLocalTriggerTrailerWord scTrailerWord(word);
-	    if (debug) cout<<"[DTROS25Unpacker]: SCTrailer, number of words "
-			   <<scTrailerWord.wordCount()<<endl;
+	    // add infos for data integrity monitoring
+	    controlData.addSCHeader(scHeaderWord);
+	    controlData.addSCTrailer(scTrailerWord);
+
+	    if (debug) cout<<"                   SC Trailer, # of words: "
+			   << scTrailerWord.wordCount() <<endl;
 	  }
 	}