Changeset b9ae4c3 in git for external/fastjet/plugins/SISCone/siscone.cc

Timestamp:

Sep 2, 2016, 3:46:14 PM (8 years ago)

Author:

GitHub <noreply@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

fa068d3

Parents:

ec5e04b (diff), 23389ff (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Pavel Demin <pavel-demin@…> (09/02/16 15:46:14)

git-committer:

GitHub <noreply@…> (09/02/16 15:46:14)

Message:

Merge pull request #32 from delphes/dev_01

Dev 01

File:

• external/fastjet/plugins/SISCone/siscone.cc (modified) (5 diffs)

external/fastjet/plugins/SISCone/siscone.cc

@@ -21 +21 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //
 //                                                                           //
-// $Revision:: 371                                                          $//
-// $Date:: 2014-09-09 10:05:32 +0200 (Tue, 09 Sep 2014)                     $//
+// $Revision:: 403                                                          $//
+// $Date:: 2016-05-19 16:52:05 +0200 (Thu, 19 May 2016)                     $//
 ///////////////////////////////////////////////////////////////////////////////
 
-//#ifdef HAVE_CONFIG_H
 #include "config.h"
-//#else
-//#define PACKAGE_NAME "SISCone"
-//#define VERSION "3.0.0"
-//#warning "No config.h file available, using preset values"
-//#endif
-
 #include "ranlux.h"
 #include "momentum.h"
@@ -254 +247 @@
   // print the banner
   if (_banner_ostr != 0){
+    ios::fmtflags flags_to_restore(_banner_ostr->flags());
+
     (*_banner_ostr) << "#ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo" << endl;
     (*_banner_ostr) << "#                    SISCone   version " << setw(28) << left << siscone_version() << "o" << endl;
@@ -269 +264 @@
 
     _banner_ostr->flush();
+    _banner_ostr->flags(flags_to_restore);
   }
 }
@@ -279 +275 @@
  * return SISCone package name.
  * This is nothing but "SISCone", it is a replacement to the
- * PACKAGE_NAME string defined in config.h and which is not
- * public by default.
+ * SISCONE_PACKAGE_NAME string defined in config.h and which is not
+ * guaranteed to be public.
  * return the SISCone name as a string
  */
 string siscone_package_name(){
-  return PACKAGE_NAME;
+  return SISCONE_PACKAGE_NAME;
 }
 
@@ -293 +289 @@
  */
 string siscone_version(){
-  return VERSION;
-}
-
-}
+  return SISCONE_VERSION;
+}
+
+}