Changeset cb80e6f in git for external/fastjet/plugins/SISCone

Timestamp:

Mar 25, 2021, 9:55:59 AM (4 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

master

Children:

13331dc

Parents:

5eda6767

Message:

update FastJet library to 3.3.4 and FastJet Contrib library to 1.045

Location:

external/fastjet/plugins/SISCone

Files:

• AUTHORS (modified) (1 diff)
• config.h (modified) (3 diffs)
• config_raw.h (modified) (3 diffs)
• geom_2d.h (modified) (2 diffs)

external/fastjet/plugins/SISCone/AUTHORS

@@ -6 +6 @@
              France
 
-         (2) PH-TH, CERN, CH-1211 Geneva 23, Switzerland;
+         (2) Rudolf Peierls Centre for Theoretical Physics, Parks Road, Oxford OX1 3PU, UK;
+             PH-TH, CERN, CH-1211 Geneva 23, Switzerland;
              LPTHE, UPMC (Univ. Paris 6), 75252 Paris cedex 05, France.
 
-phone  : +33 69 08 40 11
-         +41 22 767 2462
-
 email  : soyez@fastjet.fr
-         gavin.salam@cern.ch
+         gavin.salam@physics.ox.ac.uk

external/fastjet/plugins/SISCone/config.h

@@ -83 +83 @@
 /* Define to the full name and version of this package. */
 #ifndef SISCONE_PACKAGE_STRING 
-#define SISCONE_PACKAGE_STRING  "SISCone 3.0.4" 
+#define SISCONE_PACKAGE_STRING  "SISCone 3.0.5" 
 #endif
 
@@ -98 +98 @@
 /* Define to the version of this package. */
 #ifndef SISCONE_PACKAGE_VERSION 
-#define SISCONE_PACKAGE_VERSION  "3.0.4" 
+#define SISCONE_PACKAGE_VERSION  "3.0.5" 
 #endif
 
@@ -111 +111 @@
 /* Version number of package */
 #ifndef SISCONE_VERSION 
-#define SISCONE_VERSION  "3.0.4" 
+#define SISCONE_VERSION  "3.0.5" 
 #endif
  

external/fastjet/plugins/SISCone/config_raw.h

@@ -48 +48 @@
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "SISCone 3.0.4"
+#define PACKAGE_STRING "SISCone 3.0.5"
 
 /* Define to the one symbol short name of this package. */
@@ -57 +57 @@
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "3.0.4"
+#define PACKAGE_VERSION "3.0.5"
 
 /* Define to 1 if you have the ANSI C header files. */
@@ -66 +66 @@
 
 /* Version number of package */
-#define VERSION "3.0.4"
+#define VERSION "3.0.5"

external/fastjet/plugins/SISCone/geom_2d.h

@@ -22 +22 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //
 //                                                                           //
-// $Revision:: 268                                                          $//
-// $Date:: 2009-03-12 21:24:16 +0100 (Thu, 12 Mar 2009)                     $//
+// $Revision:: 422                                                          $//
+// $Date:: 2020-04-22 11:51:09 +0200 (Wed, 22 Apr 2020)                     $//
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -153 +153 @@
   /// return the cell index corrsponding to an eta value
   inline unsigned int get_eta_cell(double eta){
-    return (unsigned int) (1 << ((int) (32*((eta-eta_min)/(eta_max-eta_min)))));
+    return (unsigned int) (1u << ((int) (32*((eta-eta_min)/(eta_max-eta_min)))));
   }
 
   /// return the cell index corrsponding to a phi value
   inline unsigned int get_phi_cell(double phi){
-    return (unsigned int) (1 << ((int) (32*phi/twopi+16)%32));
+    return (unsigned int) (1u << ((int) (32*phi/twopi+16)%32));
   }
 };