Merge pull request #814 from ktf/remove-xdaq-mergiable

Remove xdaq mergiable

EventFilter/FEDInterface/interface/fed_header.h

@@ -0,0 +1,69 @@
+#ifndef EventFilter_FEDInterface_fed_header_h
+#define EventFilter_FEDInterface_fed_header_h
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*************************************************************************
+ *
+ * data structures and associated typedefs
+ *
+ *************************************************************************/
+
+
+/*
+ * FED header - in front of each FED block
+ */
+
+typedef struct fedh_struct {
+  uint32_t sourceid;   
+  uint32_t eventid;
+} fedh_t ;
+
+#define FED_SLINK_START_MARKER       0x5
+#define FED_SLINK_END_MARKER         0xa
+
+#define FED_HCTRLID_WIDTH            0x0000000f
+#define FED_HCTRLID_SHIFT            28
+#define FED_HCTRLID_MASK             ( FED_HCTRLID_WIDTH << FED_HCTRLID_SHIFT )
+#define FED_HCTRLID_EXTRACT(a)       ( ( (a) >> FED_HCTRLID_SHIFT ) & FED_HCTRLID_WIDTH )
+
+#define FED_EVTY_WIDTH               0x0000000f
+#define FED_EVTY_SHIFT               24
+#define FED_EVTY_MASK                ( FED_EVTY_WIDTH << FED_EVTY_SHIFT )
+#define FED_EVTY_EXTRACT(a)          ( ( (a) >> FED_EVTY_SHIFT ) & FED_EVTY_WIDTH )
+
+#define FED_LVL1_WIDTH               0x00ffffff
+#define FED_LVL1_SHIFT               0
+#define FED_LVL1_MASK                ( FED_LVL1_WIDTH << FED_LVL1_SHIFT )
+#define FED_LVL1_EXTRACT(a)          ( ( (a) >> FED_LVL1_SHIFT ) & FED_LVL1_WIDTH )
+
+#define FED_BXID_WIDTH               0x00000fff
+#define FED_BXID_SHIFT               20
+#define FED_BXID_MASK                ( FED_BXID_WIDTH << FED_BXID_SHIFT )
+#define FED_BXID_EXTRACT(a)          ( ( (a) >> FED_BXID_SHIFT ) & FED_BXID_WIDTH )
+
+#define FED_SOID_WIDTH               0x00000fff
+#define FED_SOID_SHIFT               8
+#define FED_SOID_MASK                ( FED_SOID_WIDTH << FED_SOID_SHIFT )
+#define FED_SOID_EXTRACT(a)          ( ( (a) >> FED_SOID_SHIFT ) & FED_SOID_WIDTH )
+
+#define FED_VERSION_WIDTH            0x0000000f
+#define FED_VERSION_SHIFT            4
+#define FED_VERSION_MASK             ( FED_VERSION_WIDTH << FED_VERSION_SHIFT )
+#define FED_VERSION_EXTRACT(a)       ( ( (a) >> FED_VERSION_SHIFT ) & FED_VERSION_WIDTH )
+
+#define FED_MORE_HEADERS_WIDTH       0x00000001
+#define FED_MORE_HEADERS_SHIFT       3
+#define FED_MORE_HEADERS_MASK        ( FED_MORE_HEADERS_WIDTH << FED_MORE_HEADERS_SHIFT )
+#define FED_MORE_HEADERS_EXTRACT(a)  ( ( (a) >> FED_MORE_HEADERS_SHIFT ) & FED_MORE_HEADERS_WIDTH )
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

EventFilter/FEDInterface/interface/fed_trailer.h

@@ -0,0 +1,62 @@
+#ifndef EventFilter_FEDInterface_fed_trailer_h
+#define EventFilter_FEDInterface_fed_trailer_h
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*************************************************************************
+ *
+ * data structures and associated typedefs
+ *
+ *************************************************************************/
+
+
+/*
+ * FED trailer - at the end of each FED block
+ */
+
+typedef struct fedt_struct {
+  uint32_t conscheck;
+  uint32_t eventsize;
+} fedt_t ;
+
+
+#define FED_TCTRLID_WIDTH            0x0000000f
+#define FED_TCTRLID_SHIFT            28
+#define FED_TCTRLID_MASK             ( FED_TCTRLID_WIDTH << FED_TCTRLID_SHIFT )
+#define FED_TCTRLID_EXTRACT(a)       ( ( (a) >> FED_TCTRLID_SHIFT ) & FED_TCTRLID_WIDTH )
+
+#define FED_EVSZ_WIDTH               0x00ffffff
+#define FED_EVSZ_SHIFT               0
+#define FED_EVSZ_MASK                ( FED_EVSZ_WIDTH << FED_EVSZ_SHIFT )
+#define FED_EVSZ_EXTRACT(a)          ( ( (a) >> FED_EVSZ_SHIFT ) & FED_EVSZ_WIDTH )
+
+#define FED_CRCS_WIDTH               0x0000ffff
+#define FED_CRCS_SHIFT               16
+#define FED_CRCS_MASK                ( FED_CRCS_WIDTH << FED_CRCS_SHIFT )
+#define FED_CRCS_EXTRACT(a)          ( ( (a) >> FED_CRCS_SHIFT ) & FED_CRCS_WIDTH )
+
+#define FED_STAT_WIDTH               0x0000000f
+#define FED_STAT_SHIFT               8
+#define FED_STAT_MASK                ( FED_STAT_WIDTH << FED_STAT_SHIFT )
+#define FED_STAT_EXTRACT(a)          ( ( (a) >> FED_STAT_SHIFT ) & FED_STAT_WIDTH )
+
+#define FED_TTSI_WIDTH               0x0000000f
+#define FED_TTSI_SHIFT               4
+#define FED_TTSI_MASK                ( FED_TTSI_WIDTH << FED_TTSI_SHIFT )
+#define FED_TTSI_EXTRACT(a)          ( ( (a) >> FED_TTSI_SHIFT ) & FED_TTSI_WIDTH )
+
+#define FED_MORE_TRAILERS_WIDTH      0x00000001
+#define FED_MORE_TRAILERS_SHIFT      3
+#define FED_MORE_TRAILERS_MASK       ( FED_MORE_TRAILERS_WIDTH << FED_MORE_TRAILERS_SHIFT )
+#define FED_MORE_TRAILERS_EXTRACT(a) ( ( (a) >> FED_MORE_TRAILERS_SHIFT ) & FED_MORE_TRAILERS_WIDTH )
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

EventFilter/Utilities/BuildFile.xml

@@ -1,7 +1,6 @@
 <use   name="FWCore/MessageLogger"/>
 <use   name="FWCore/ServiceRegistry"/>
 <use   name="EventFilter/FEDInterface"/>
-<use   name="xdaq"/>
 <use   name="curl"/>
 <export>
   <lib   name="1"/>

EventFilter/Utilities/ChangeLog

@@ -1,7 +1,43 @@
-2013-03-07 Emilio Meschi <emilio.meschi@cern.ch>
+2013-08-29 Emilio Meschi <emilio.meschi@cern.ch>
 
-	* tag V02-19-39
-	* minimal fixes for 62X
+	* commit first compiling F3 branch to git
+	* many changes, documented elsewhere
+
+2012-11-28 Srecko Morovic <srecko.morovic@cern.ch>
+
+	* updated fake BU writer
+
+2012-12-05 Srecko Morovic <srecko.morovic@cern.ch>
+
+	* tag V02-20-00-06 
+	* updated fake BU writer, updated how directory looks
+	* detection of lumi directories (if used) by source
+	* handling of empty lumisections (empty directory) by source
+	* shutdown_flag recognized by FRD source
+	* Remi's new FRD format (v3) reading
+
+2012-11-05 Srecko Morovic <srecko.morovic@cern.ch>
+
+	* tag V02-20-00-05 (fixed compilation)
+	* tag V02-20-00-04
+	* removed setLumiBlock for event principal as it is now fixed upstream
+
+2012-11-02 Srecko Morovic <srecko.morovic@cern.ch>
+
+	* tag V02-20-00-03
+	* get FRD Input source working with new RawInputSource
+
+2012-11-01 Srecko Morovic <srecko.morovic@cern.ch>
+
+	* tag V02-20-00-01
+	* fixed non-linux compilation in multi-threaded fakeBU output module
+
+2012-11-01 Srecko Morovic <srecko.morovic@cern.ch>
+
+	* tag V02-20-00-00
+	* forkFBEvF branch (61X only)
+	* adapted FedRawData input source to latest upstream input source
+	changes
 
 2012-09-02 Srecko Morovic <srecko.morovic@cern.ch>