From 8cc02bd6e8c14bdceff5c0f503be35ff6ad51381 Mon Sep 17 00:00:00 2001
From: Rosen Matev <rosen.matev@cern.ch>
Date: Thu, 2 Jun 2016 17:37:06 +0200
Subject: [PATCH 1/2] Prepare v25r3 release

---
 CMakeLists.txt             |  4 +--
 MooreSys/CMakeLists.txt    |  2 +-
 MooreSys/cmt/requirements  |  6 ++---
 MooreSys/doc/release.notes | 51 +++++++++++++++++++++++++++++++++++++-
 cmt/project.cmt            |  2 +-
 5 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9db86665d9b..2bd585c0c75 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,8 +6,8 @@ find_package(GaudiProject)
 #---------------------------------------------------------------
 
 # Declare project name and version
-gaudi_project(Moore v25r2
-              USE Hlt v25r2
+gaudi_project(Moore v25r3
+              USE Hlt v25r3
               DATA AppConfig VERSION v3r*
                    FieldMap VERSION v5r*
                    PRConfig VERSION v1r*
diff --git a/MooreSys/CMakeLists.txt b/MooreSys/CMakeLists.txt
index 7f18c69326f..6b8189e89e0 100644
--- a/MooreSys/CMakeLists.txt
+++ b/MooreSys/CMakeLists.txt
@@ -1,7 +1,7 @@
 ################################################################################
 # Package: MooreSys
 ################################################################################
-gaudi_subdir(MooreSys v25r2)
+gaudi_subdir(MooreSys v25r3)
 
 gaudi_depends_on_subdirs(Hlt/Moore
                          L0/L0App)
diff --git a/MooreSys/cmt/requirements b/MooreSys/cmt/requirements
index 0f6e4f8496d..f48e6488654 100755
--- a/MooreSys/cmt/requirements
+++ b/MooreSys/cmt/requirements
@@ -1,13 +1,13 @@
 package MooreSys
-version           v25r2
+version           v25r3
 branches doc cmt
 
 #=======================================================
 # Don't forget the applications
 #=======================================================
 
-use  Moore               v25r2    Hlt
-use  L0App               v2r4     L0
+use Moore * Hlt
+use L0App * L0
 
 # Declare this as a container package
 apply_pattern container_package
diff --git a/MooreSys/doc/release.notes b/MooreSys/doc/release.notes
index 90b1d9043a0..803f0c57f43 100755
--- a/MooreSys/doc/release.notes
+++ b/MooreSys/doc/release.notes
@@ -1,8 +1,57 @@
 <PRE>
 Package             : MooreSys
-Package Coordinator : R. Aaij
+Package Coordinator : Rosen Matev, Roel Aaij
 Purpose             : LHCb HLT application
 
+</PRE><H1><A NAME=v25r3>2016-06-02 Moore v25r3</A></H1><PRE>
+Production release for post-TS1 (June 2016)
+--------------------------------------------------------------------------------
+Based on Gaudi v27r1, LHCb v40r2, Rec v19r3, Phys v21r5 and Hlt v25r3.
+
+- Fix many tests and remove obsolete ones.
+  - Fix mc_mooreratetest_eff to put up with ERROR from Herschel decoder
+  - Remove obsolete tests
+    - 2010 data tests
+    - magicnumber
+  - Fix vdm test to use VanDerMeerScan_2016 and proper input data
+  - Fix passthrough test to run in Hlt1 split mode
+  - Fix 2016_draft and 2016_may to put up with WARNING from Hlt2HcalCov.HcalCovarTool.DBAccessor
+  - Fix vdm_streams test
+  - Fix cosmics test
+  - Fix sim08 test and make it tolerate "known" warnings and errors
+  - Fix old TCK tests
+  - Attempt to fix calibration test but proper input data is missing
+  - Remove unused files in tests/options
+  - See merge request !22
+- Change db tags in options file for functor cache creation.
+  - See merge request !21
+- Fix some of the failing nightlies.
+  - Reduced numbers of events in some cases and increased the timeout for createtck2.
+  - See merge request !20
+- Mvesteri moore rate test signal mc.
+  Moore_RateTest.py in PRConfig now has an "efficiency" mode. Two new qmtests
+  - Rerun L0 on an already jugged MC sample in the TestFileDB
+  - Run $PRCONFIGROOT/.../MooreRateTest.py with --mode="efficiency" using the output of the previous step as input
+  - See merge request !17
+- Update testfiledb sample and conddb tag.
+  - See merge request !18
+- Add ReplayL0DUOnly option to L0App.
+  - Used to recompute L0DU decision using the existing L0Calo and L0Muon data.
+  - See merge request !12
+- Added new TCK tests.
+  - See merge request !13 and !15
+- Do not count errors in tck.redol0 test.
+  - See merge request !10
+- Don't set HltConf().EnableOutputStreaming when configuring output.
+  - See merge request !9
+- Fix DB issue in main qmtests with physics settings.
+  - See merge request !7 and !8
+- Add qmtests for the RedoL0 and CreateTCK1 steps of the split TCK creation and testing procedure
+- Don't count warnings in validator for hltratesmoore.qmt
+- Updated reference of Hlt1 PrChecker test and added a test for Hlt2.
+  - See merge request !5
+
+
 </PRE><H1><A NAME=v25r2>2016-04-18 MooreSys v25r2</A></H1><PRE>
 
 Based on LHCb v40r1 stack + Rec v19r2 and Phys v21r3
diff --git a/cmt/project.cmt b/cmt/project.cmt
index d478e81491e..194a012d1a1 100755
--- a/cmt/project.cmt
+++ b/cmt/project.cmt
@@ -1,6 +1,6 @@
 project MOORE
 
-use HLT     HLT_v25r2
+use HLT     HLT_v25r3
 
 container       MooreSys
 build_strategy	with_installarea
-- 
GitLab


From 18c9d0d235fd1302fef4f403ec4230658ea28521 Mon Sep 17 00:00:00 2001
From: Rosen Matev <rosen.matev@cern.ch>
Date: Tue, 7 Jun 2016 08:31:39 +0200
Subject: [PATCH 2/2] Update release.notes

---
 MooreSys/doc/release.notes | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/MooreSys/doc/release.notes b/MooreSys/doc/release.notes
index 803f0c57f43..7a7312ee9a0 100755
--- a/MooreSys/doc/release.notes
+++ b/MooreSys/doc/release.notes
@@ -6,8 +6,20 @@ Purpose             : LHCb HLT application
 </PRE><H1><A NAME=v25r3>2016-06-02 Moore v25r3</A></H1><PRE>
 Production release for post-TS1 (June 2016)
 --------------------------------------------------------------------------------
-Based on Gaudi v27r1, LHCb v40r2, Rec v19r3, Phys v21r5 and Hlt v25r3.
-
+Based on Gaudi v27r1, LHCb v40r2, Rec v19r3p1, Phys v21r5 and Hlt v25r3.
+
+- Suppress warnings and errors from functor cache
+  - This sets the default output level to FATAL and the python logger
+    level to ERROR.
+  - CLOSES LHCBPS-1538
+  - See merge request !25
+- Move from Physics_pp_May2016 to Physics_pp_June2016.
+  - Update 2016_may to 2016_june
+  - Update TCK tests to use Physics_pp_June2016
+  - Make sure 2016_draft and 2016_june write out a csv timing table
+  - Add prerequisite to hlt1only
+  - Update settings in tistos
+  - See merge request !23
 - Fix many tests and remove obsolete ones.
   - Fix mc_mooreratetest_eff to put up with ERROR from Herschel decoder
   - Remove obsolete tests
-- 
GitLab