Panoptes release v5r2.

This tag contains the result of the command

   getpack --no-config --protocol anonymous --project --recursive --batch Panoptes v5r2

The Panoptes project was tagged as PANOPTES_v5r2 at svn release 172255.

The svn path for this commit was

   svn+ssh://svn.cern.ch/reps/lhcb/Panoptes/tags/PANOPTES/PANOPTES_v5r2

The latest comment on svn was the following:

   Adding Panoptes tag v5r2.

PanoptesSys/CMakeLists.txt

+################################################################################
+# Package: PanoptesSys
+################################################################################
+gaudi_subdir(PanoptesSys v5r2)
+
+gaudi_depends_on_subdirs(Rich/Panoptes
+                         Rich/RichDataMerge
+                         Rich/RichMirrAlign
+                         Rich/RichMirrCombinFit
+                         Rich/RichMirrorAlignmentGanga
+                         Rich/RichMonitoringSys
+                         Rich/RichMonitoringTools
+                         Rich/RichOnlineMonitors
+                         Rich/RichRecSys)
+

PanoptesSys/cmt/requirements

 package PanoptesSys
-version v5r1
+version v5r2
 
 branches cmt doc
 
 #
 # Panoptes application
 #
-use Panoptes                 v5r1  Rich
+use Panoptes                 v5r2  Rich
 
 
 #
 # RICH online monitoring packages
 #
-use RichMonitoringSys        v2r17 Rich
-use RichMonitoringTools      v2r20 Rich
-use RichOnlineMonitors       v2r21 Rich
-use RichDataMerge            v2r3  Rich
-
-# Temporarily specify a version of RichRecSys package to override the version coming from Rec
-use RichRecSys               v4r9  Rich
+use RichMonitoringSys        v2r18 Rich
+use RichMonitoringTools      v2r21 Rich
+use RichOnlineMonitors       v2r22 Rich
+use RichDataMerge            v2r5  Rich
 
 #
 # RICH semi-online mirror monitoring packages
 #
-use RichMirrCombinFit        v11r1 Rich
-use RichMirrAlign            v16r1 Rich
-use RichMirrorAlignmentGanga v11r1 Rich
+use RichMirrCombinFit        v13r1 Rich
+use RichMirrAlign            v16r3 Rich
+use RichMirrorAlignmentGanga v11r2 Rich
 
 # Declare this as a container package
 apply_pattern container_package

PanoptesSys/cmt/version.cmt

-v5r1
+v5r2

PanoptesSys/doc/release.notes

@@ -3,6 +3,8 @@ Package             : PanoptesSys
 Package Coordinator : Ulrich Kerzel
 Purpose             : LHCb RICH online monitor application
 
+</PRE><H1><A NAME=v5r2>2014-04-27 Panoptes v5r2</A></H1><PRE>
+This version uses projects: Gaudi v25r1, LHCb v37r1, Online v5r8
 
 </PRE><H1><A NAME=v5r1>2013-11-14 Panoptes v5r1</A></H1><PRE>
 This version uses projects: Gaudi v23r10, LHCb v36r3, Online v5r5

Rich/Panoptes/CMakeLists.txt

+################################################################################
+# Package: Panoptes
+################################################################################
+gaudi_subdir(Panoptes v5r1)
+
+gaudi_depends_on_subdirs(DAQ/MDF
+                         Det/DDDB
+                         Det/DetDescSvc
+                         Det/Magnet
+                         Det/RichDet
+                         GaudiConf
+                         GaudiKernel
+                         GaudiPython
+                         GaudiSvc
+                         Kernel/LHCbAlgs
+                         Rich/RichDAQ
+                         Rich/RichMCTools
+                         Rich/RichMonitoringSys
+                         Rich/RichRecBase
+                         Rich/RichRecMCTools
+                         Rich/RichRecMonitors
+                         Rich/RichRecQC
+                         Rich/RichRecSys
+                         Rich/RichTools
+                         Tf/TrackSys
+                         Tools/XmlTools)
+
+find_package(RELAX)
+
+gaudi_install_python_modules()
+
+gaudi_alias(PanoptesOffline
+            gaudirun.py)
+message(WARNING "Cannot create PanoptesOnline alias until the new name of GaudiOnline/Gaudi.exe is defined")
+#gaudi_alias(PanoptesOnline
+#            ${GAUDIONLINEROOT}/${BINDIR}/Gaudi.exe libGaudiOnline.so GaudiOnline -runable=LHCb::OnlineRunable -loop -auto)
+
+gaudi_env(SET PANOPTESOPTS \${PANOPTESROOT}/options)
+

Rich/Panoptes/cmt/requirements

 package Panoptes
-version v5r1
+version v5r2
 
 branches doc cmt options
 

Rich/Panoptes/cmt/version.cmt

-v5r1
+v5r2

Rich/Panoptes/doc/release.notes

@@ -4,6 +4,9 @@
 ! Purpose : LHCb RICH online monitor application
 !----------------------------------------------------------------------------
 
+====================== v5r2 ================================================
+! 2014-02-10 - Marco Clemencic
+ - Added CMake configuration.
 
 ====================== v5r1 ================================================
 

Rich/RichDataMerge/CMakeLists.txt

+################################################################################
+# Package: RichDataMerge
+################################################################################
+gaudi_subdir(RichDataMerge v2r5)
+
+gaudi_depends_on_subdirs(Rich/RichKernel)
+
+gaudi_add_module(RichDataMerge
+                 src/*.cpp
+                 LINK_LIBRARIES RichKernelLib)
+

Rich/RichDataMerge/cmt/requirements

@@ -3,10 +3,10 @@
 # Maintainer : Christopher Rob JONES
 #============================================================================
 package           RichDataMerge
-version           v2r3
+version           v2r5
 
 #============================================================================
-# Structure, i.e. directories to process. 
+# Structure, i.e. directories to process.
 #============================================================================
 branches          cmt doc src
 #============================================================================

Rich/RichDataMerge/cmt/version.cmt

-v2r3
+v2r5

Rich/RichDataMerge/doc/release.notes

 !-----------------------------------------------------------------------------
 ! Package     : Rich/RichDataMerge
 ! Responsible : Christopher Rob JONES
-! Purpose     : 
+! Purpose     :
 !-----------------------------------------------------------------------------
 
+===================== v2r5 ======================
+
+===================== v2r4 ======================
+! 2014-02-10 - Marco Clemencic
+ - Added CMake configuration.
+
 ===================== v2r3 ======================
 ! 2013-07-08 - Chris Jones
  - Fix compilation issue with boost and c++11

Rich/RichMirrAlign/CMakeLists.txt

+################################################################################
+# Package: RichMirrAlign
+################################################################################
+gaudi_subdir(RichMirrAlign v16r3)
+
+find_package(Boost COMPONENTS regex program_options)
+find_package(ROOT COMPONENTS Hist Minuit2)
+find_package(XercesC)
+find_package(XQilla)
+
+gaudi_add_executable(RichMirrAlign
+                     src/RichMirrAlignFcn.cpp
+                     src/RichMirrAlign.cpp
+                     INCLUDE_DIRS Boost XercesC XQilla ROOT
+                     LINK_LIBRARIES Boost XercesC XQilla ROOT)
+
+gaudi_add_executable(RichHPDAlign
+                     src/AlignHPDs.cpp
+                     src/HPDAlignParam.cpp
+                     src/RichHPDAlign.cpp
+                     INCLUDE_DIRS Boost XercesC XQilla ROOT
+                     LINK_LIBRARIES Boost XercesC XQilla ROOT)
+
+gaudi_install_python_modules()
+

Rich/RichMirrAlign/cmt/requirements

 package RichMirrAlign
-version v16r1
+version v16r3
 
 branches cmt doc python src
 
@@ -18,7 +18,7 @@ macro_append    Boost_linkopts " $(Boost_linkopts_regex) "
 macro_append    Boost_linkopts " $(Boost_linkopts_program_options) "
 #===============================================================================
 # which application to build
-application  RichMirrAlign  ../src/RichAlignFcn.cpp ../src/RichMirrAlign.cpp
+application  RichMirrAlign  ../src/RichMirrAlignFcn.cpp ../src/RichMirrAlign.cpp
 application  RichHPDAlign  ../src/AlignHPDs.cpp ../src/HPDAlignParam.cpp ../src/RichHPDAlign.cpp
 
 apply_pattern application_path

Rich/RichMirrAlign/cmt/version.cmt

-v16r1
+v16r3

Rich/RichMirrAlign/doc/release_notes.html

 <pre>
 Package              : Rich/RichMirrAlign
-Package Coordinators : Matt Coombes, Anatoly Solomin
+Package Coordinators : Matthew Coombes, Anatoly Solomin
 Purpose              : RICH mirror alignment program
 </pre>
 
 
-<h2><a name="v15r1)">2011-06-09 Rich/RichMirrAlign v16r0</a></h2>
-<h3><a name="Note">This version released in PANOPTES v4r1.
-                  Added HPD alignment</a></h3>
+<h2><a name="v16r3)">2014-04-27 Rich/RichMirrAlign v16r3</a></h2>
+<h3><a name="Note">This version released in PANOPTES v5r3.</a></h3>
 
-2012-12-20  - Matt Coombes
+<h2><a name="v16r2)">2014-04-27 Rich/RichMirrAlign v16r2</a></h2>
+<h3><a name="Note">This version released in PANOPTES v5r2.</a></h3>
+<pre>
+2014-03-10 - Anatoly Solomin
+- Fixed map side0-side1 mirror numbers of RICH1. Eliminated its
+  duplication.
+- Fixed RICH1 equation-order string for the first iteration.
+
+2014-03-09 - Anatoly Solomin
+- Incremented version to v16r2
+- Restored previous coding conventions.
+- Improved readability.
+- Fixed string defining the equation solving order. Only
+  one primary 12 mirror has fixed correction instead of
+  the pri 12 and sec 09 pair.
+- Corrected RICH1 "most-populated" secondary mirror numbers.
+- Added comments in the "algebraic" part of RICH2.
+- For consistency, renamed RichAlignFcn to RichMirrAlignFcn.
+</pre>
+
+<h2><a name="v16r1)">2013-11-14 Rich/RichMirrAlign v16r1</a></h2>
+<h3><a name="Note">This version released in PANOPTES v5r1.
+                   Added HPD alignment.</a></h3>
+<pre>
+2012-12-20  - Matthew Coombes
 - Removed more warnings
-       
-2012-12-10  - Matt Coombes
-- Removed some compile time warnings       
-    
+
+2012-12-10  - Matthew Coombes
+- Removed some compile time warnings
+
 2012-07-26 - Matthew Coombes
-- Added HPD alignment to RichAlign Package.
-                  
+- Added HPD alignment to RichMirrAlign Package.
+</pre>
 
 <h2><a name="v15r1)">2011-06-09 Rich/RichMirrAlign v15r1</a></h2>
 <h3><a name="Note">This version released in PANOPTES v3r4.
@@ -30,10 +53,10 @@ Purpose              : RICH mirror alignment program
   to help with faster convergence.
 
 2011-06-09 - Matthew Coombes
-- Introduce algebraic solution method for RICH1 
+- Introduce algebraic solution method for RICH1
 
 2011-06-08 - Anatoly Solomin
-- Increment version v15r1.
+- Incremented version to v15r1.
 - Streamlined job, file, etc. naming conventions for better
   usability. Modified programmatic name formation accordingly
 - Improved code readability.
@@ -48,7 +71,7 @@ Purpose              : RICH mirror alignment program
   are totally rewritten.
 
 2011-05-20 - Anatoly Solomin
-- Increment version v14r5.
+- Incremented version to v14r5.
 - Corrected these release notes: fixed the header of the
   previous release, to address the fact that in PANOPTES
   v3r0, v3r1 and v3r2 these packages were temporarily
@@ -67,13 +90,13 @@ Purpose              : RICH mirror alignment program
                    minimization of RMS.</a></h3>
 <pre>
 2011-03-30 - Matthew Coombes
-- Increment version v14r4.
+- Incremented version to v14r4.
 - Fixed bug to work with RICH1.
 - Found bug that prevented alignment moving to it1 in solution
   method 0. Temp fix.
-  
+
 2010-11-09 - Anatoly Solomin
-- Increment version v14r3. From now on, based only on
+- Incremented version to v14r3. From now on, based only on
   Xerces-C++ 3.1 and XQilla.
 - Completely new approach: the system of equations is not
   over-determined any more. An optimized subset of mirror
@@ -85,9 +108,9 @@ Purpose              : RICH mirror alignment program
 - Fixed mirrors are denoted in the steering list by
   brackets and handled properly automatically.
 - Further cosmetic improvements of printout.
-  
+
 2010-08-30 - Anatoly Solomin
-- Increment version v12r0.
+- Incremented version to v12r0.
 - Implemented fixation of pair of primary and secondary
   segments on each side of RICH2 p12s09 and p43s30.
 </pre>
@@ -99,25 +122,25 @@ Purpose              : RICH mirror alignment program
                    migrated to XQilla (in case 3.1).</a></h3>
 <pre>
 2010-08-07 - Anatoly Solomin
-- Increment version v11r0.
+- Incremented version to v11r0.
 - Migrated to XQilla.
 
 2010-07-06 - Anatoly Solomin
-- Increment version v10r0.
+- Incremented version to v10r0.
 - Implemented fork (using #ifdef XERCESC_GE_31) for using both
   Xerces-C++ 2.8/3.1 in lhcb-prerelease/lhcb-gaudi-head
   nightlies respectively.
 - For Xerces-C++ 3.1 implemented usage of XPath.
 
 2010-07-01 - Anatoly Solomin, Matt Coombes
-- Increment version v9r0.
+- Incremented version to v9r0.
 - Started universalization for both RICHes.
 - Started rewriting the Xerces part to meet new options in 3.1.
 - Forked code so that it compiles against both 2.8 and 3.1 by
   using #ifdef XERCESC_GE_31.
 
 2010-06-03 - Anatoly Solomin
-- Increment version v8r2.
+- Incremented version to v8r2.
 - Solved problem of back-reproducing the predefined tilts in MC
   for testing purposes.
 
@@ -133,7 +156,7 @@ Purpose              : RICH mirror alignment program
                    coefficients variably calibrated.</a></h3>
 <pre>
 2010-05-26 - Anatoly Solomin
-- Increment version v8r1.
+- Incremented version to v8r1.
 - Made magnification coefficients calibration tilts
   variate-able instead of being always 1 mrad.
 
@@ -146,7 +169,7 @@ Purpose              : RICH mirror alignment program
   re-reconstruction iterations.
 
 2010-05-14 - Anatoly Solomin
-- Increment version v7r7.
+- Incremented version to v7r7.
 - Improved printout.
 - New (ASCII-graphical) way to choose subsets of mirror
   segments to be non-fixed, with variated alignment
@@ -156,24 +179,24 @@ Purpose              : RICH mirror alignment program
   re-reconstruction iterations.
 
 2010-05-04 - Anatoly Solomin
-- Increment version v7r6.
+- Incremented version to v7r6.
 - Added printing of the cumulative corrections after each
   iteration.
 
 2010-04-26 - Anatoly Solomin
-- Increment version v7r5.
+- Incremented version to v7r5.
 - Fixed stop-to-iterate criterion.
 - Improved printing of the resultant corrections of each
   iteration.
 
 2010-04-15 - Anatoly Solomin
-- Increment version v7r4.
+- Incremented version to v7r4.
 - Improved naming convention. Following respective
   modifications in the Rich2MirrCombinFit.
 - Better passing variant name via program options.
 
 2010-03-28 - Anatoly Solomin
-- Increment version v7r2. Accumulates massive modifications.
+- Incremented version to v7r2. Accumulates massive modifications.
 - Fit both dimensions, i.e. Y and Z jointly. As a consequence,
   number of equations doubled.
 - Subset of mirrors defined by an "ASCII-pictorial" list of
@@ -193,7 +216,7 @@ Purpose              : RICH mirror alignment program
                    Minor cleanup.</a></h3>
 <pre>
 2009-07-21 - Anatoly Solomin
-- Increment version v5r6.
+- Incremented version to v5r6.
 - Minor cleanup.
 </pre>
 
@@ -204,11 +227,11 @@ Purpose              : RICH mirror alignment program
                    hardcodedness.</a></h3>
 <pre>
 2009-07-21 - Anatoly Solomin
-- Increment version v5r4.
+- Incremented version to v5r4.
 - Reduced hardcodedness.
 
 2009-07-16 - Anatoly Solomin
-- Increment version v5r3.
+- Incremented version to v5r3.
 - Fit one dimension at a time, i.e. Y and Z separately.
 - System of equations degeneracy resolved by always fixing
   one of the sought tilts equal to 0.0.

Rich/RichMirrAlign/src/RichAlignFcn.cpp → Rich/RichMirrAlign/src/RichMirrAlignFcn.cpp

@@ -3,7 +3,7 @@
 #include <vector>
 #include <boost/format.hpp>
 #include <boost/lexical_cast.hpp>
-#include "RichAlignFcn.h"
+#include "RichMirrAlignFcn.h"
 
 using     boost::format;
 using     boost::lexical_cast;
@@ -13,14 +13,14 @@ using       std::map;
 using       std::string;
 using       std::vector;
 //-----------------------------------------------------------------------------
-// Implementation file for class : RichAlignFcn
+// Implementation file for class : RichMirrAlignFcn
 //
 // 2004-11-08 : Antonis Papanestis
 //-----------------------------------------------------------------------------
 //=============================================================================
 // Standard constructor, initializes variables
 //=============================================================================
-RichAlignFcn::RichAlignFcn(
+RichMirrAlignFcn::RichMirrAlignFcn(
 const                      vector<unsigned int>& mirrCombinListInt,
 const vector<vector<vector<vector<double> > > >& coeff,
 const vector<vector<vector<vector<double> > > >& totalTiltsMrad,
@@ -35,19 +35,19 @@ m_Y_or_Z_or_both                               ( Y_or_Z_or_both      ),
 
 m_theErrorDef                                  ( 1.0                 ) {
 
-//cout <<"Hello from RichAlignFcn! Initialization."<< endl;
+//cout <<"Hello from RichMirrAlignFcn! Initialization."<< endl;
 
 }
 //=============================================================================
 // Destructor
 //=============================================================================
-RichAlignFcn::~RichAlignFcn() {}
+RichMirrAlignFcn::~RichMirrAlignFcn() {}
 //=========================================================================
-double RichAlignFcn::operator()( const vector<double>& params ) const {
+double RichMirrAlignFcn::operator()( const vector<double>& params ) const {
   /*
   cout << endl; cout << endl; cout << endl; cout << endl; cout << endl; cout << endl;
   cout << endl; cout << endl; cout << endl; cout << endl; cout << endl; cout << endl;
-  cout <<"Hello from RichAlignFcn! Iteration."<< endl;
+  cout <<"Hello from RichMirrAlignFcn! Iteration."<< endl;
   */
   //
   /*

Rich/RichMirrAlign/src/RichAlignFcn.h → Rich/RichMirrAlign/src/RichMirrAlignFcn.h

-/** @class RichAlignFcn RichAlignFcn.h
+/** @class RichMirrAlignFcn RichMirrAlignFcn.h
  *
  *  @author Antonis Papanestis
  *  @date   2004-11-08
  */
-#ifndef RICHALIGN_RICHALIGNFCN_H
-#define RICHALIGN_RICHALIGNFCN_H 1
+#ifndef RICHALIGN_RICMIRRHALIGNFCN_H
+#define RICHALIGN_RICHMIRRALIGNFCN_H 1
 
 #include <map>
 #include <vector>
 #include <Minuit2/FCNBase.h>
 
-class   RichAlignFcn : public ROOT::Minuit2::FCNBase {
+class   RichMirrAlignFcn : public ROOT::Minuit2::FCNBase {
 
 public:
   /// Standard constructor
-  RichAlignFcn(
+  RichMirrAlignFcn(
   const                                     std::vector<unsigned int>& mirrCombinListInt,
   const std::vector<std::vector<std::vector<std::vector<double> > > >& coeff,
   const std::vector<std::vector<std::vector<std::vector<double> > > >& totalTiltsMrad,
@@ -22,7 +22,7 @@ public:
   const                                                   std::string& Y_or_Z_or_both
   );
 
-  virtual ~RichAlignFcn( ); ///< Destructor
+  virtual ~RichMirrAlignFcn( ); ///< Destructor
 
   virtual double Up() const { return m_theErrorDef; }
 
@@ -40,5 +40,5 @@ private:
 
                                                                double  m_theErrorDef;
 };
-#endif // RICHALIGN_RICHALIGNFCN_H
+#endif // RICHALIGN_RICHMIRRALIGNFCN_H
 

Rich/RichMirrCombinFit/CMakeLists.txt

+################################################################################
+# Package: RichMirrCombinFit
+################################################################################
+gaudi_subdir(RichMirrCombinFit v13r1)
+
+find_package(Boost COMPONENTS regex program_options)
+find_package(ROOT COMPONENTS Core Hist Graf Gpad RIO RooFitCore RooFit RooStats)
+find_package(GSL)
+
+gaudi_add_executable(RichMirrCombinFit
+                     src/RichMirrFit.cpp
+                     src/Rich2MirrFit.cpp
+                     src/Rich1MirrFit.cpp
+                     src/RichMirrorPair.cpp
+                     src/MirrorFit.cpp
+                     src/DThetaFitter.cpp
+                     INCLUDE_DIRS Boost ROOT GSL
+                     LINK_LIBRARIES Boost ROOT GSL)
+
+gaudi_add_executable(RichHPDFit
+                     src/RichMirrorPair.cpp
+                     src/RichMirrFit.cpp
+                     src/HPDCombinFit.cpp
+                     src/HPDFit.cpp
+                     src/DThetaFitter.cpp
+                     INCLUDE_DIRS Boost ROOT GSL
+                     LINK_LIBRARIES Boost ROOT GSL)
+
+gaudi_install_headers(RichMirrCombinFit)
+gaudi_install_python_modules()
+