'Fix CMakeLists.txt' (ALFA_RawDataByteStreamCnv-00-00-24)

	* Tagging ALFA_RawDataByteStreamCnv-00-00-24
	* Fix CMakeLists.txt

2016-07-29  scott snyder  <snyder@bnl.gov>

	* Tagging ALFA_RawDataByteStreamCnv-00-00-23.
	* endreq -> endmsg.

2016-06-02 Christian Heinz <christian.heinz@cern.ch>

	* Introduction of the EventFlagBit and changed Failure Code to Success for corrupted events


Former-commit-id: aba528da48b7d53410fd6b064fd456335dbcf04d

ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/ALFA_RawDataByteStreamCnv/ALFAEventBitInfo.h

+/*
+  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef ALFAEVENTCNV_ALFAEVENTBITINFO_H
+#define ALFAEVENTCNV_ALFAEVENTBITINFO_H
+
+ namespace ALFAEventBitInfo {
+   enum   ALFAFLAGREASON {
+     ROB_ERROR = 1 		///< ROB status error
+     ,CORRUPTION = 2 		///< data corrupted
+     ,COLL_NOT_FOUND = 3 		///< collection not found
+   };
+ }
+#endif

ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/CMakeLists.txt

@@ -13,17 +13,19 @@ atlas_depends_on_subdirs( PUBLIC
                           Event/ByteStreamCnvSvcBase
                           Event/ByteStreamData
                           ForwardDetectors/ALFA/ALFA_RawEv
-                          GaudiKernel )
+                          GaudiKernel
+                          PRIVATE
+                          Event/xAOD/xAODEventInfo)
 
 # External dependencies:
-find_package( tdaq-common )
+find_package( tdaq-common COMPONENTS eformat )
 
 # Component(s) in the package:
 atlas_add_component( ALFA_RawDataByteStreamCnv
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps DataModel StoreGateLib SGtests ByteStreamCnvSvcBaseLib ByteStreamData ByteStreamData_test ALFA_RawEv GaudiKernel )
+                     LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps DataModel StoreGateLib SGtests ByteStreamCnvSvcBaseLib ByteStreamData ByteStreamData_test ALFA_RawEv GaudiKernel xAODEventInfo)
 
 # Install files from the package:
 atlas_install_headers( ALFA_RawDataByteStreamCnv )

ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/cmt/requirements

@@ -12,11 +12,12 @@ use DataModel            DataModel-*                    Control
 use GaudiInterface       GaudiInterface-*               External
 use StoreGate            StoreGate-*                    Control
 use ByteStreamData       ByteStreamData-*               Event
-
+private
+use  xAODEventInfo              xAODEventInfo-*                 Event/xAOD
+end_private
 
 branches src src/components run 
 
 library ALFA_RawDataByteStreamCnv *.cxx -s=components *.cxx
 apply_pattern component_library
 
-

ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/ALFA_Decoder_charge.cxx

@@ -43,19 +43,19 @@ StatusCode ALFA_Decoder_charge::initialize() {
    
   StatusCode sc;
   sc = AthAlgTool::initialize(); 
-  msg(MSG::DEBUG) << " ALFA_RoDDecoder_charge::initialize" << endreq;
+  msg(MSG::DEBUG) << " ALFA_RoDDecoder_charge::initialize" << endmsg;
   if (sc.isFailure()) return sc;
 
  // Get ROBDataProviderSvc
   if (m_robDataProvider.retrieve().isFailure()) {
-    msg(MSG::FATAL) << "Failed to retrieve service " << m_robDataProvider << endreq;
+    msg(MSG::FATAL) << "Failed to retrieve service " << m_robDataProvider << endmsg;
     return StatusCode::FAILURE;
   } else
-    msg(MSG::DEBUG) << "Retrieved service " << m_robDataProvider << endreq;
+    msg(MSG::DEBUG) << "Retrieved service " << m_robDataProvider << endmsg;
  
 
   if(StatusCode::SUCCESS !=serviceLocator()->service("StoreGateSvc", m_EvtStore)) {
-   msg(MSG::FATAL) <<"Can't get StoreGateSvc "<< endreq;
+   msg(MSG::FATAL) <<"Can't get StoreGateSvc "<< endmsg;
     return StatusCode::FAILURE; 
   }
 
@@ -82,9 +82,9 @@ StatusCode ALFA_Decoder_charge::initialize() {
 ////////////////////////
 StatusCode ALFA_Decoder_charge::finalize() { 
 
-msg(MSG::DEBUG) << " ALFA_RoDDecoder_charge::FINALIZE" << endreq;
+msg(MSG::DEBUG) << " ALFA_RoDDecoder_charge::FINALIZE" << endmsg;
 
-msg(MSG::DEBUG) << " Bytestream summary:" << m_fragment_number << " fragments found" << endreq;
+msg(MSG::DEBUG) << " Bytestream summary:" << m_fragment_number << " fragments found" << endmsg;
 
 
   delete m_ALFA_RawDataReadOut_charge;
@@ -100,7 +100,7 @@ msg(MSG::DEBUG) << " Bytestream summary:" << m_fragment_number << " fragments fo
 // fillCollection() -
 ////////////////////////
 StatusCode ALFA_Decoder_charge::fillCollection(const ROBFragment *robFrag, ALFA_RawDataContainer_charge* rdoCont, std::vector<unsigned int>* ) {
- msg(MSG::DEBUG) << " ALFA_RoDDecoder_charge::fillCollection" << endreq;
+ msg(MSG::DEBUG) << " ALFA_RoDDecoder_charge::fillCollection" << endmsg;
 
 StatusCode sc = StatusCode::SUCCESS;
 
@@ -139,7 +139,7 @@ uint16_t CountPMF0=0;
 
  catch (eformat::Issue &ex)
   {
-  msg(MSG::DEBUG) <<ex.what ()<< endreq; 
+  msg(MSG::DEBUG) <<ex.what ()<< endmsg; 
      return StatusCode::FAILURE;  // error in fragment - we search for no collection
    }
 
@@ -155,7 +155,7 @@ uint16_t CountPMF0=0;
  
      if (*it)
     {
-      msg(MSG::DEBUG) << " Error in ROB status word: 0x" << endreq; 
+      msg(MSG::DEBUG) << " Error in ROB status word: 0x" << endmsg; 
         return StatusCode::FAILURE;
      }
   }
@@ -177,12 +177,12 @@ uint16_t CountPMF0=0;
   uint32_t ROD_LVL1_ID  = robFrag->rod_lvl1_id(); 
   
 msg(MSG::DEBUG) << "============================" << std::endl;
-msg(MSG::DEBUG) <<"Frag Size  : " << robFrag->rod_fragment_size_word() << endreq;
-msg(MSG::DEBUG) <<"Header Size: " << robFrag->rod_header_size_word() << endreq;
-msg(MSG::DEBUG) <<"Source  ID : " << m_ROD_source_ID << endreq;
-msg(MSG::DEBUG) <<"Run num    : " << robFrag->rod_run_no() << endreq;
-msg(MSG::DEBUG) <<"Version    : " << robFrag->rod_version() << endreq;
-msg(MSG::DEBUG) << " ROD_LVL1_ID " <<ROD_LVL1_ID<<  endreq; 
+msg(MSG::DEBUG) <<"Frag Size  : " << robFrag->rod_fragment_size_word() << endmsg;
+msg(MSG::DEBUG) <<"Header Size: " << robFrag->rod_header_size_word() << endmsg;
+msg(MSG::DEBUG) <<"Source  ID : " << m_ROD_source_ID << endmsg;
+msg(MSG::DEBUG) <<"Run num    : " << robFrag->rod_run_no() << endmsg;
+msg(MSG::DEBUG) <<"Version    : " << robFrag->rod_version() << endmsg;
+msg(MSG::DEBUG) << " ROD_LVL1_ID " <<ROD_LVL1_ID<<  endmsg; 
 msg(MSG::DEBUG) << "============================" << std::endl;
  
 
@@ -190,16 +190,16 @@ uint32_t evt_Id = ((robFrag->rod_lvl1_id()) & 0xFF000000) >> 24;
 uint32_t lvl1_Id = ((robFrag->rod_lvl1_id()) & 0x00FFFFFF) ; 
 
 
-msg(MSG::DEBUG) <<" evt_Id    : " <<  evt_Id << " lvl1_Id    : " <<  lvl1_Id <<endreq;   
+msg(MSG::DEBUG) <<" evt_Id    : " <<  evt_Id << " lvl1_Id    : " <<  lvl1_Id <<endmsg;   
 
- /*msg(MSG::DEBUG) << " **********Decoder dumping the words******** "<< endreq; 
+ /*msg(MSG::DEBUG) << " **********Decoder dumping the words******** "<< endmsg; 
    
 if (size > 0) {
-msg(MSG::DEBUG) << " The size of this ROD-read is "<< endreq; 
+msg(MSG::DEBUG) << " The size of this ROD-read is "<< endmsg; 
     for (unsigned int i=0; i < size; i++)
- msg(MSG::DEBUG) << " word " << i << " = " << MSG::hex << vint[i] << MSG::dec<< endreq; 
+ msg(MSG::DEBUG) << " word " << i << " = " << MSG::hex << vint[i] << MSG::dec<< endmsg; 
    } else {
-msg(MSG::DEBUG) << " Buffer size 0 ! "<< endreq; 
+msg(MSG::DEBUG) << " Buffer size 0 ! "<< endmsg; 
         return StatusCode::FAILURE;
    }*/
 
@@ -228,18 +228,18 @@ msg(MSG::DEBUG) << " Buffer size 0 ! "<< endreq;
 		Count_evt++;
 		//if (Count_evt == maxEvt) break;		
 	
-	msg(MSG::INFO) << " Event_num " << Event_num << " Count_evt " << Count_evt <<  endreq; 
+	msg(MSG::INFO) << " Event_num " << Event_num << " Count_evt " << Count_evt <<  endmsg; 
 	
 
 
 	
  	if (m_ALFA_RawDataCollectionReadOut->is_BOB()) 
    	 {
-		msg(MSG::DEBUG) << " Found the beginning of buffer "<< endreq;     
+		msg(MSG::DEBUG) << " Found the beginning of buffer "<< endmsg;     
   		  // Check that Lvl1d matches the one from the ROD header. this is the number of event.it corresponds to m_ALFA_RawDataReadOut_charge->ecnt_BOT() and m_ALFA_RawDataReadOut_charge->ecnt_EOT()
-		msg(MSG::DEBUG) << " Level 1 Id : " << m_ALFA_RawDataCollectionReadOut->lvl1Id()<< endreq; 
+		msg(MSG::DEBUG) << " Level 1 Id : " << m_ALFA_RawDataCollectionReadOut->lvl1Id()<< endmsg; 
    	  } else {
-		msg(MSG::DEBUG) << " Beginning of block not found BOB "<< endreq; 
+		msg(MSG::DEBUG) << " Beginning of block not found BOB "<< endmsg; 
   	  } // BOB
 
 	
@@ -252,7 +252,7 @@ msg(MSG::DEBUG) << " Buffer size 0 ! "<< endreq;
     	  		wordPos += 1;
     	  		if (wordPos >= size) 
     	  			{
-    		    		msg(MSG::ERROR)<<" Error: data corrupted" << endreq;
+    		    		msg(MSG::ERROR)<<" Error: data corrupted" << endmsg;
     		    		return StatusCode::FAILURE;
     	  			}
     	  		m_ALFA_RawDataCollectionReadOut->decodeWord(vint[wordPos]);
@@ -261,21 +261,21 @@ msg(MSG::DEBUG) << " Buffer size 0 ! "<< endreq;
     
     			if (m_ALFA_RawDataCollectionReadOut->is_BOL())  
     			{			
-			msg(MSG::DEBUG) << " Found the beginning of Link BOL"<< endreq;  
-			msg(MSG::DEBUG) << " MrodNum BOL : " << m_ALFA_RawDataCollectionReadOut->MrodNum()<< " RODinput BOL : " <<m_ALFA_RawDataCollectionReadOut->RODinput()<< endreq; 
+			msg(MSG::DEBUG) << " Found the beginning of Link BOL"<< endmsg;  
+			msg(MSG::DEBUG) << " MrodNum BOL : " << m_ALFA_RawDataCollectionReadOut->MrodNum()<< " RODinput BOL : " <<m_ALFA_RawDataCollectionReadOut->RODinput()<< endmsg; 
 	   
 			} // is_BOL()
     			
     			else if (m_ALFA_RawDataCollectionReadOut->is_EOB()) 
     			{
-      			msg(MSG::DEBUG)<<" Error: collection not found " << endreq;
+      			msg(MSG::DEBUG)<<" Error: collection not found " << endmsg;
       			return StatusCode::FAILURE;
     			} // is_EOB()
     
     		
 			wordPos += 1;
 			if (wordPos >= size) {
-			msg(MSG::ERROR)<<" Error: data corrupted"<< endreq;
+			msg(MSG::ERROR)<<" Error: data corrupted"<< endmsg;
   			return StatusCode::FAILURE;
       			}
 		
@@ -287,7 +287,7 @@ msg(MSG::DEBUG) << " Buffer size 0 ! "<< endreq;
 			
 			uint16_t slotIdNum  = m_ALFA_RawDataReadOut_charge->SlotId();
 	        							
-	       		msg(MSG::DEBUG)<<"  Decoding data from Slot Id number : " <<  slotIdNum << endreq;
+	       		msg(MSG::DEBUG)<<"  Decoding data from Slot Id number : " <<  slotIdNum << endmsg;
 						
 			ALFA_RawData_charge* rawData_charge; 
 
@@ -298,7 +298,7 @@ msg(MSG::DEBUG) << " Buffer size 0 ! "<< endreq;
 					wordPos += 1;
 				  	if (wordPos >= size) 
 	          			{
-	            			msg(MSG::DEBUG)<<" Error: data corrupted" << endreq;
+	            			msg(MSG::DEBUG)<<" Error: data corrupted" << endmsg;
 	            			return StatusCode::FAILURE;
 	          			}
 	          		
@@ -311,13 +311,13 @@ msg(MSG::DEBUG) << " Buffer size 0 ! "<< endreq;
 	
 	if (m_ALFA_RawDataReadOut_charge->is_TDCch() ) {
 							
-		// if(m_ALFA_RawDataReadOut_charge->ChannelNumId() ==1) msg(MSG::DEBUG)<<" DECODER : PMFId  " <<  m_ALFA_RawDataReadOut_charge->PMFId() <<  " ChannelNumId  " << m_ALFA_RawDataReadOut_charge->ChannelNumId() << " ChargeChanId "<< m_ALFA_RawDataReadOut_charge->ChargeChanId() <<endreq;
+		// if(m_ALFA_RawDataReadOut_charge->ChannelNumId() ==1) msg(MSG::DEBUG)<<" DECODER : PMFId  " <<  m_ALFA_RawDataReadOut_charge->PMFId() <<  " ChannelNumId  " << m_ALFA_RawDataReadOut_charge->ChannelNumId() << " ChargeChanId "<< m_ALFA_RawDataReadOut_charge->ChargeChanId() <<endmsg;
 							
 				
 																	
 		if(m_ALFA_RawDataReadOut_charge->PMFId() ==0){
 		//  && m_ALFA_RawDataReadOut_charge->bit27_24()==1 					
-			// msg(MSG::DEBUG) << " Creation of the new collection"<< endreq;     
+			// msg(MSG::DEBUG) << " Creation of the new collection"<< endmsg;     
     			
 			
 			CountPMF0++;
@@ -335,7 +335,7 @@ msg(MSG::DEBUG) << " Buffer size 0 ! "<< endreq;
 					if(CountPMF0==1) collection = getCollection(MBIdNum,rdoCont );
 					if(collection) collection->SetMBId_POT(MBIdNum);
 							
-					if(CountPMF0==1) msg(MSG::DEBUG)<<"  DECODER : MBIdNum  " <<  MBIdNum << endreq;
+					if(CountPMF0==1) msg(MSG::DEBUG)<<"  DECODER : MBIdNum  " <<  MBIdNum << endmsg;
 					
 						
 				}
@@ -364,7 +364,7 @@ msg(MSG::DEBUG) << " Buffer size 0 ! "<< endreq;
 			rawData_charge->SetChargeChan_PMF(ChargeNum);
 			
 			
-			msg(MSG::DEBUG)<<"  PMFIdNum = " << PMFIdNum <<"  ChannelIdNum = " << ChannelIdNum <<" chargeNum = " <<  ChargeNum << endreq;
+			msg(MSG::DEBUG)<<"  PMFIdNum = " << PMFIdNum <<"  ChannelIdNum = " << ChannelIdNum <<" chargeNum = " <<  ChargeNum << endmsg;
 					
 			std::vector<uint16_t> ChargeHitId;
 			ChargeHitId.push_back(ChargeNum);
@@ -394,12 +394,12 @@ msg(MSG::DEBUG) << " Buffer size 0 ! "<< endreq;
 				
 					 
 			if (m_ALFA_RawDataReadOut_charge->is_EOT() && m_ALFA_RawDataReadOut_charge->bit24_27()!=0) {
-			msg(MSG::DEBUG) << " Event Counter EOT : " << m_ALFA_RawDataReadOut_charge->ecnt_EOT()<< endreq; 
+			msg(MSG::DEBUG) << " Event Counter EOT : " << m_ALFA_RawDataReadOut_charge->ecnt_EOT()<< endmsg; 
 			}
 	
 			wordPos += 1;
  			if (wordPos >= size) {
-	            	msg(MSG::DEBUG)<<" Error: data corrupted" << endreq;
+	            	msg(MSG::DEBUG)<<" Error: data corrupted" << endmsg;
 	            	return StatusCode::FAILURE;
 	          	}
 					
@@ -412,7 +412,7 @@ msg(MSG::DEBUG) << " Buffer size 0 ! "<< endreq;
 		wordPos += 1;
                 if (wordPos >= size) 
 	        {
-	        msg(MSG::DEBUG)<<" Error: data corrupted" << endreq;
+	        msg(MSG::DEBUG)<<" Error: data corrupted" << endmsg;
 	       	return StatusCode::FAILURE;
 	       	}
 					
@@ -452,7 +452,7 @@ if(collection) collection->SetBCId_POT(BC_ID);
 	
 	if (m_ALFA_RawDataCollectionReadOut->is_EOB()) 
    	{	
-	 msg(MSG::DEBUG) << " Found the end of block EOB ---------------------- "<<  endreq; 
+	 msg(MSG::DEBUG) << " Found the end of block EOB ---------------------- "<<  endmsg; 
 	} 
 	
 	wordPos += 1;
@@ -470,7 +470,7 @@ if(collection) collection->SetBCId_POT(BC_ID);
 
 ALFA_RawDataCollection_charge* ALFA_Decoder_charge::getCollection(unsigned int MBIdNum, ALFA_RawDataContainer_charge* cont) {
 
-msg(MSG::DEBUG) << " ALFA_RoDDecoder_charge::getCollection" << endreq;
+msg(MSG::DEBUG) << " ALFA_RoDDecoder_charge::getCollection" << endmsg;
 
   ALFA_RawDataCollection_charge* coll;
   
@@ -488,12 +488,12 @@ msg(MSG::DEBUG) << " ALFA_RoDDecoder_charge::getCollection" << endreq;
   }
   if (collExists) {
     coll = const_cast<ALFA_RawDataCollection_charge*>(&**cont_it);
-    msg(MSG::DEBUG) << " Collection exists " << endreq;
+    msg(MSG::DEBUG) << " Collection exists " << endmsg;
     return 0;
 
   } else {  // if collection does not exist create it
     coll = new ALFA_RawDataCollection_charge(MBIdNum);
-    msg(MSG::DEBUG) << " create collection; MBId  " << MBIdNum <<endreq;
+    msg(MSG::DEBUG) << " create collection; MBId  " << MBIdNum <<endmsg;
     cont->push_back(coll);  // add collection to container
   }
   

ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/ALFA_RawDataContainerReadOut.cxx

@@ -78,14 +78,14 @@ void ALFA_RawDataContainerReadOut::decodeHeader(std::vector<uint32_t>& vData)
   if (vData[0] != RODmarker) 
     {
 #ifndef NDEBUG
-      log << MSG::ERROR << "ROD Start of header marker not found" << endreq;
+      log << MSG::ERROR << "ROD Start of header marker not found" << endmsg;
 #endif
       assert(0);
     }
   if (vData[1] != RODheadersize) 
     {
 #ifndef NDEBUG
-      log << MSG::ERROR << "ROD header size doesn't match " << endreq;
+      log << MSG::ERROR << "ROD header size doesn't match " << endmsg;
 #endif
       assert(0);
     }

ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/ALFA_RawDataProvider.cxx

@@ -38,23 +38,23 @@ ALFA_RawDataProvider::~ALFA_RawDataProvider(){}
 StatusCode ALFA_RawDataProvider::initialize()
 {
 
-  msg(MSG::DEBUG) << "ALFA_RawDataProvider::initialize" << endreq;
+  msg(MSG::DEBUG) << "ALFA_RawDataProvider::initialize" << endmsg;
 
   // Get ROBDataProviderSvc
   if (m_robDataProvider.retrieve().isFailure())
     {
-      msg(MSG::FATAL) << "Failed to retrieve service " << m_robDataProvider << endreq;
+      msg(MSG::FATAL) << "Failed to retrieve service " << m_robDataProvider << endmsg;
       return StatusCode::FAILURE;
     } else
-    msg(MSG::DEBUG) << "Retrieved service " << m_robDataProvider << endreq;
+    msg(MSG::DEBUG) << "Retrieved service " << m_robDataProvider << endmsg;
 
   // Get ALFARawDataProviderTool
   if (m_rawDataTool.retrieve().isFailure())
     {
-      msg(MSG::FATAL) << "Failed to retrieve service " << m_rawDataTool << endreq;
+      msg(MSG::FATAL) << "Failed to retrieve service " << m_rawDataTool << endmsg;
       return StatusCode::FAILURE;
     } else
-    msg(MSG::DEBUG) << "Retrieved service " << m_rawDataTool << endreq;
+    msg(MSG::DEBUG) << "Retrieved service " << m_rawDataTool << endmsg;
 
   return StatusCode::SUCCESS;
 }
@@ -69,11 +69,11 @@ StatusCode ALFA_RawDataProvider::initialize()
 StatusCode ALFA_RawDataProvider::execute()
 {
 
-  msg(MSG::DEBUG) << "ALFA_RawDataProvider::EXECUTE" << endreq;
+  msg(MSG::DEBUG) << "ALFA_RawDataProvider::EXECUTE" << endmsg;
 
 
   ALFA_RawDataContainer *container = new ALFA_RawDataContainer();
-  msg(MSG::DEBUG) << " Created ALFA RDO Container" << endreq;
+  msg(MSG::DEBUG) << " Created ALFA RDO Container" << endmsg;
 
   StatusCode sc;
 
@@ -81,10 +81,10 @@ StatusCode ALFA_RawDataProvider::execute()
 
   if (sc.isFailure())
     {
-      msg(MSG::FATAL) << "Unable to record ALFA RDO Container" << endreq;
+      msg(MSG::FATAL) << "Unable to record ALFA RDO Container" << endmsg;
       return StatusCode::FAILURE;
     } else if (sc.isSuccess()){
-    msg(MSG::DEBUG) << "ALFA RDO Container recorded" << endreq;
+    msg(MSG::DEBUG) << "ALFA RDO Container recorded" << endmsg;
   }
 
 
@@ -97,18 +97,18 @@ StatusCode ALFA_RawDataProvider::execute()
   m_robDataProvider->getROBData(ROBIDs, listOfRobf);
 
 
-  msg(MSG::DEBUG) << "  ROB ID " << std::hex <<ROBIDs <<MSG::dec<< endreq;
+  msg(MSG::DEBUG) << "  ROB ID " << std::hex <<ROBIDs <<MSG::dec<< endmsg;
 
-  msg(MSG::DEBUG) << " Number of ROB fragments is " << listOfRobf.size() << endreq;
+  msg(MSG::DEBUG) << " Number of ROB fragments is " << listOfRobf.size() << endmsg;
 
   // ask ALFA_RawDataProviderTool to decode it and to fill the container
 
   if (m_rawDataTool->convert(listOfRobf,container).isFailure())
     {
-      msg(MSG::ERROR) << "BS conversion into RDOs failed" << endreq;
+      msg(MSG::ERROR) << "BS conversion into RDOs failed" << endmsg;
       return StatusCode::RECOVERABLE;
     } else
-    msg(MSG::DEBUG) << " Number of collections in container is " << container->size() << endreq;
+    msg(MSG::DEBUG) << " Number of collections in container is " << container->size() << endmsg;
 
 
   // check retrieve from StoreGate ///////////////////////////////////////////////////////////
@@ -116,54 +116,7 @@ StatusCode ALFA_RawDataProvider::execute()
   sc = evtStore()->retrieve(container, m_ALFA_RawDataCollectionKey);
   if (sc.isSuccess())
     {
-      msg(MSG::DEBUG) << "ALFA RDO Container retrieved" << endreq;
-
-/*
-      ALFA_RawDataContainer::const_iterator RawData_Collection_Beg = container->begin();
-      ALFA_RawDataContainer::const_iterator RawData_Collection_End = container->end();
-
-      //int MBId_prova;
-
-      //loop over collection (container) with hits (i.e. over 1 event)
-      for(;RawData_Collection_Beg!=RawData_Collection_End;++RawData_Collection_Beg)
-	{
-
-	  //MBId_prova =(*RawData_Collection_Beg)->GetMBId_POT();
-
-	  //msg(MSG::DEBUG)  << " MBId = " << MBId_prova <<  endreq;
-
-
-	  ALFA_RawDataCollection::const_iterator p_RawData_Beg=(*RawData_Collection_Beg)->begin();//pointer to RawData data vector
-	  ALFA_RawDataCollection::const_iterator p_RawData_End=(*RawData_Collection_Beg)->end();
-
-	  //int PMFId_prova;
-	  //int FiberNum_prova;
-
-
-	  // Loop over RawData   -> apparently this is not used anymore
-
-	  for(;p_RawData_Beg!=p_RawData_End; ++p_RawData_Beg)
-	    {
-
-	      if (((*p_RawData_Beg)->GetWordId_PMF())==3)
-		{
-		  //PMFId_prova = ((*p_RawData_Beg)->GetPMFId_PMF());
-		  //msg(MSG::DEBUG)  << " PMFId = " << ((*p_RawData_Beg)->GetPMFId_PMF()) <<  endreq;
-
-		} else {PMFId_prova = 100;}
-
-	      for (unsigned int i=0;i<16;i++)
-		{
-		  //FiberNum_prova = ((*p_RawData_Beg)->GetWordId_PMF()*16+i);
-
-		  //if((*p_RawData_Beg)->HitChan()[i]!=100) msg(MSG::DEBUG)  <<"    hit = " << (*p_RawData_Beg)-> HitChan()[i]<< endreq;
-		}
-
-
-	    } // loop raw data
-
-	}// loop collection
-	*/
+      msg(MSG::DEBUG) << "ALFA RDO Container retrieved" << endmsg;
     } // end check
 
   return StatusCode::SUCCESS;

ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/ALFA_RawDataProviderTool.cxx

@@ -36,19 +36,19 @@ StatusCode ALFA_RawDataProviderTool::initialize() {
 
   StatusCode sc = AthAlgTool::initialize(); 
   
-  msg(MSG::DEBUG) << "INITIALIZE ALFA_RawDataProviderTool" << endreq;
+  msg(MSG::DEBUG) << "INITIALIZE ALFA_RawDataProviderTool" << endmsg;
   
   if (sc.isFailure()) {
-     msg(MSG::FATAL) << " Failed to init baseclass" << endreq;
+     msg(MSG::FATAL) << " Failed to init baseclass" << endmsg;
      return StatusCode::FAILURE;
    }
 
    // Retrieve decoder
    if (m_decoder.retrieve().isFailure()) {
-     msg(MSG::FATAL) << " Failed to retrieve tool " << m_decoder << endreq;
+     msg(MSG::FATAL) << " Failed to retrieve tool " << m_decoder << endmsg;
      return StatusCode::FAILURE;
    } else {
-   msg(MSG::DEBUG) << "Retrieved tool m_decoder " << m_decoder << endreq;
+   msg(MSG::DEBUG) << "Retrieved tool m_decoder " << m_decoder << endmsg;
    }
 
    return StatusCode::SUCCESS;
@@ -65,24 +65,24 @@ StatusCode ALFA_RawDataProviderTool::initialize() {
 StatusCode ALFA_RawDataProviderTool::convert( std::vector<const ROBFragment*>& vecRobs, ALFA_RawDataContainer* rdoCont)
 
 {
-  msg(MSG::DEBUG) << "CONVERT ALFA_RawDataProviderTool" << endreq;
+  msg(MSG::DEBUG) << "CONVERT ALFA_RawDataProviderTool" << endmsg;
   
    static uint32_t LastLvl1ID = 0xffffffff;
    
-  msg(MSG::DEBUG) << "Number of ROB fragments is " << vecRobs.size() << endreq;
+  msg(MSG::DEBUG) << "Number of ROB fragments is " << vecRobs.size() << endmsg;
 
   if(vecRobs.size() == 0) return StatusCode::SUCCESS;
 
   std::vector<const ROBFragment*>::const_iterator rob_it = vecRobs.begin();
 
-  msg(MSG::DEBUG) << "(*rob_it)->rod_lvl1_id() " << (*rob_it)->rod_lvl1_id() << " LastLvl1ID " << LastLvl1ID << endreq;
+  msg(MSG::DEBUG) << "(*rob_it)->rod_lvl1_id() " << (*rob_it)->rod_lvl1_id() << " LastLvl1ID " << LastLvl1ID << endmsg;
  
   // are we working on a new event ?
   if ( ((*rob_it)->rod_lvl1_id())!= LastLvl1ID ) {
 
-msg(MSG::DEBUG) << "**********************" <<  endreq;
-    msg(MSG::DEBUG) << "New event, reset the collection set" << endreq;
-  msg(MSG::DEBUG) << "**********************" <<  endreq;
+msg(MSG::DEBUG) << "**********************" <<  endmsg;
+    msg(MSG::DEBUG) << "New event, reset the collection set" << endmsg;
+  msg(MSG::DEBUG) << "**********************" <<  endmsg;
   
     
     // remember last Lvl1ID
@@ -94,7 +94,7 @@ msg(MSG::DEBUG) << "**********************" <<  endreq;
     rdoCont->clear();
   }
   else{
-  msg(MSG::DEBUG) << "Same event!!!!!!!!!!!!!!" << endreq;
+  msg(MSG::DEBUG) << "Same event!!!!!!!!!!!!!!" << endmsg;
   }
 
 
@@ -106,11 +106,11 @@ msg(MSG::DEBUG) << "**********************" <<  endreq;
     
     // check if this ROBFragment was already decoded
     if (!m_robIdSet.insert(robid).second) {
-     msg(MSG::DEBUG) << " ROB Fragment with ID " << std::hex<<robid<<std::dec << " already decoded, skip" << endreq;
+     msg(MSG::DEBUG) << " ROB Fragment with ID " << std::hex<<robid<<std::dec << " already decoded, skip" << endmsg;
    } else {
       StatusCode sc = m_decoder->fillCollection(&**rob_it, rdoCont);
       if (sc.isFailure()) return sc;
-      msg(MSG::DEBUG) << " ROB Fragment with ID " << std::hex<<robid<<std::dec << " fill Container" << endreq;
+      msg(MSG::DEBUG) << " ROB Fragment with ID " << std::hex<<robid<<std::dec << " fill Container" << endmsg;
     }
   }// loop over the ROB fragments
 
@@ -126,7 +126,7 @@ StatusCode ALFA_RawDataProviderTool::finalize() {
 
  StatusCode sc = AthAlgTool::finalize();
 
-msg(MSG::DEBUG) << "FINALIZE ALFA_RawDataProviderTool" << endreq;
+msg(MSG::DEBUG) << "FINALIZE ALFA_RawDataProviderTool" << endmsg;
 
    return sc;
 }

ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/ALFA_RawDataProviderTool_charge.cxx

@@ -36,19 +36,19 @@ StatusCode ALFA_RawDataProviderTool_charge::initialize() {
 
   StatusCode sc = AthAlgTool::initialize(); 
   
-  msg(MSG::DEBUG) << "INITIALIZE ALFA_RawDataProviderTool_charge" << endreq;
+  msg(MSG::DEBUG) << "INITIALIZE ALFA_RawDataProviderTool_charge" << endmsg;
   
   if (sc.isFailure()) {
-     msg(MSG::FATAL) << " Failed to init baseclass" << endreq;
+     msg(MSG::FATAL) << " Failed to init baseclass" << endmsg;
      return StatusCode::FAILURE;
    }
 
    // Retrieve decoder
    if (m_decoder_charge.retrieve().isFailure()) {
-     msg(MSG::FATAL) << " Failed to retrieve tool " << m_decoder_charge << endreq;
+     msg(MSG::FATAL) << " Failed to retrieve tool " << m_decoder_charge << endmsg;
      return StatusCode::FAILURE;
    } else {
-   msg(MSG::DEBUG) << "Retrieved tool m_decoder_charge " << m_decoder_charge << endreq;
+   msg(MSG::DEBUG) << "Retrieved tool m_decoder_charge " << m_decoder_charge << endmsg;
    }
 
    return StatusCode::SUCCESS;
@@ -65,24 +65,24 @@ StatusCode ALFA_RawDataProviderTool_charge::initialize() {
 StatusCode ALFA_RawDataProviderTool_charge::convert_charge( std::vector<const ROBFragment*>& vecRobs, ALFA_RawDataContainer_charge* rdoCont)
 
 {
-  msg(MSG::DEBUG) << "CONVERT ALFA_RawDataProviderTool_charge" << endreq;
+  msg(MSG::DEBUG) << "CONVERT ALFA_RawDataProviderTool_charge" << endmsg;
   
    static uint32_t LastLvl1ID = 0xffffffff;
    
-  msg(MSG::DEBUG) << "Number of ROB fragments is " << vecRobs.size() << endreq;
+  msg(MSG::DEBUG) << "Number of ROB fragments is " << vecRobs.size() << endmsg;
 
   if(vecRobs.size() == 0) return StatusCode::SUCCESS;
 
   std::vector<const ROBFragment*>::const_iterator rob_it = vecRobs.begin();
 
-  msg(MSG::DEBUG) << "(*rob_it)->rod_lvl1_id() " << (*rob_it)->rod_lvl1_id() << " LastLvl1ID " << LastLvl1ID << endreq;
+  msg(MSG::DEBUG) << "(*rob_it)->rod_lvl1_id() " << (*rob_it)->rod_lvl1_id() << " LastLvl1ID " << LastLvl1ID << endmsg;
  
   // are we working on a new event ?
   if ( ((*rob_it)->rod_lvl1_id())!= LastLvl1ID ) {
 
-msg(MSG::DEBUG) << "**********************" <<  endreq;
-    msg(MSG::DEBUG) << "New event, reset the collection set" << endreq;
-  msg(MSG::DEBUG) << "**********************" <<  endreq;
+msg(MSG::DEBUG) << "**********************" <<  endmsg;
+    msg(MSG::DEBUG) << "New event, reset the collection set" << endmsg;
+  msg(MSG::DEBUG) << "**********************" <<  endmsg;
   
     
     // remember last Lvl1ID
@@ -94,7 +94,7 @@ msg(MSG::DEBUG) << "**********************" <<  endreq;
     rdoCont->clear();
   }
   else{
-  msg(MSG::DEBUG) << "Same event!!!!!!!!!!!!!!" << endreq;
+  msg(MSG::DEBUG) << "Same event!!!!!!!!!!!!!!" << endmsg;
   }
 
 
@@ -106,10 +106,10 @@ msg(MSG::DEBUG) << "**********************" <<  endreq;
     
     // check if this ROBFragment was already decoded
     if (!m_robIdSet.insert(robid).second) {
-     msg(MSG::DEBUG) << " ROB Fragment with ID " << std::hex<<robid<<std::dec << " already decoded, skip" << endreq;
+     msg(MSG::DEBUG) << " ROB Fragment with ID " << std::hex<<robid<<std::dec << " already decoded, skip" << endmsg;
    } else {
       StatusCode sc = m_decoder_charge->fillCollection(&**rob_it, rdoCont);
-      msg(MSG::DEBUG) << " ROB Fragment with ID " << std::hex<<robid<<std::dec << " fill Container" << endreq;
+      msg(MSG::DEBUG) << " ROB Fragment with ID " << std::hex<<robid<<std::dec << " fill Container" << endmsg;
     }
   }// loop over the ROB fragments
 
@@ -124,7 +124,7 @@ StatusCode ALFA_RawDataProviderTool_charge::finalize() {
 
  StatusCode sc = AthAlgTool::finalize();
 
-msg(MSG::DEBUG) << "FINALIZE ALFA_RawDataProviderTool_charge" << endreq;
+msg(MSG::DEBUG) << "FINALIZE ALFA_RawDataProviderTool_charge" << endmsg;
 
    return sc;
 }

ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/ALFA_RawDataProvider_charge.cxx

@@ -38,21 +38,21 @@ ALFA_RawDataProvider_charge::~ALFA_RawDataProvider_charge(){
 ////////////////////////
 StatusCode ALFA_RawDataProvider_charge::initialize() {
 
-  msg(MSG::DEBUG) << "ALFA_RawDataProvider_charge::initialize" << endreq;
+  msg(MSG::DEBUG) << "ALFA_RawDataProvider_charge::initialize" << endmsg;
 
   // Get ROBDataProviderSvc
   if (m_robDataProvider.retrieve().isFailure()) {
-    msg(MSG::FATAL) << "Failed to retrieve service " << m_robDataProvider << endreq;
+    msg(MSG::FATAL) << "Failed to retrieve service " << m_robDataProvider << endmsg;
     return StatusCode::FAILURE;
   } else
-    msg(MSG::DEBUG) << "Retrieved service " << m_robDataProvider << endreq;
+    msg(MSG::DEBUG) << "Retrieved service " << m_robDataProvider << endmsg;
 
   // Get ALFARawDataProviderTool
   if (m_rawDataTool_charge.retrieve().isFailure()) {
-    msg(MSG::FATAL) << "Failed to retrieve service " << m_rawDataTool_charge << endreq;
+    msg(MSG::FATAL) << "Failed to retrieve service " << m_rawDataTool_charge << endmsg;
     return StatusCode::FAILURE;
   } else
-    msg(MSG::DEBUG) << "Retrieved service " << m_rawDataTool_charge << endreq;
+    msg(MSG::DEBUG) << "Retrieved service " << m_rawDataTool_charge << endmsg;
 
   return StatusCode::SUCCESS;
 }
@@ -66,21 +66,21 @@ StatusCode ALFA_RawDataProvider_charge::initialize() {
 ////////////////////////
 StatusCode ALFA_RawDataProvider_charge::execute() {
 
-msg(MSG::DEBUG) << "ALFA_RawDataProvider_charge::EXECUTE" << endreq;
+msg(MSG::DEBUG) << "ALFA_RawDataProvider_charge::EXECUTE" << endmsg;
 
 
   ALFA_RawDataContainer_charge *container = new ALFA_RawDataContainer_charge();
-   msg(MSG::DEBUG) << " Created ALFA RDO Container_charge" << endreq;
+   msg(MSG::DEBUG) << " Created ALFA RDO Container_charge" << endmsg;
 
  StatusCode sc;
 
  sc = evtStore()->record(container, m_ALFA_RawDataCollectionKey_charge);
 
   if (sc.isFailure()) {
-    msg(MSG::FATAL) << "Unable to record ALFA RDO Container_charge" << endreq;
+    msg(MSG::FATAL) << "Unable to record ALFA RDO Container_charge" << endmsg;
     return StatusCode::FAILURE;
    } else if (sc.isSuccess()){
-  msg(MSG::DEBUG) << "ALFA RDO Container_charge recorded" << endreq;
+  msg(MSG::DEBUG) << "ALFA RDO Container_charge recorded" << endmsg;
   }
 
 
@@ -93,16 +93,16 @@ msg(MSG::DEBUG) << "ALFA_RawDataProvider_charge::EXECUTE" << endreq;
   m_robDataProvider->getROBData(ROBIDs, listOfRobf);
 
 
-    msg(MSG::DEBUG) << "  ROB ID " << std::hex <<ROBIDs <<MSG::dec<< endreq;
+    msg(MSG::DEBUG) << "  ROB ID " << std::hex <<ROBIDs <<MSG::dec<< endmsg;
 
-    msg(MSG::DEBUG) << " Number of ROB fragments is " << listOfRobf.size() << endreq;
+    msg(MSG::DEBUG) << " Number of ROB fragments is " << listOfRobf.size() << endmsg;
 
   // ask ALFA_RawDataProviderTool to decode it and to fill the container
 
  if (m_rawDataTool_charge->convert_charge(listOfRobf,container).isFailure()){
-    msg(MSG::ERROR) << "BS conversion into RDOs failed" << endreq;
+    msg(MSG::ERROR) << "BS conversion into RDOs failed" << endmsg;
 } else
-    msg(MSG::DEBUG) << " Number of collections in container is " << container->size() << endreq;
+    msg(MSG::DEBUG) << " Number of collections in container is " << container->size() << endmsg;
 
 
   // check retrieve from StoreGate ///////////////////////////////////////////////////////////
@@ -110,7 +110,7 @@ msg(MSG::DEBUG) << "ALFA_RawDataProvider_charge::EXECUTE" << endreq;
   sc = evtStore()->retrieve(container, m_ALFA_RawDataCollectionKey_charge);
   if (sc.isSuccess())
   {
-	msg(MSG::DEBUG) << "ALFA RDO Container retrieved" << endreq;
+	msg(MSG::DEBUG) << "ALFA RDO Container retrieved" << endmsg;
   } // end check
 
   return StatusCode::SUCCESS;