From 284ac35087b51960c653838c7b39bc34d619dba9 Mon Sep 17 00:00:00 2001
From: scott snyder <scott.snyder@cern.ch>
Date: Fri, 12 Jan 2018 17:28:12 +0100
Subject: [PATCH] CosmicGenerator: Fix compilation warnings.
Compilation warnings:
Unused private class data members.
Unused fortran statement label.
Consistent common block alignment between fortran and C++.
---
Generators/CosmicGenerator/CosmicGenerator/CosmicGenerator.h | 1 -
Generators/CosmicGenerator/src/CosmicGenerator.cxx | 2 --
Generators/CosmicGenerator/src/CosmicGun.cxx | 2 +-
Generators/CosmicGenerator/src/cosmic2.f | 1 -
4 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/Generators/CosmicGenerator/CosmicGenerator/CosmicGenerator.h b/Generators/CosmicGenerator/CosmicGenerator/CosmicGenerator.h
index 4447253f0d8..ba8b7d983f1 100644
--- a/Generators/CosmicGenerator/CosmicGenerator/CosmicGenerator.h
+++ b/Generators/CosmicGenerator/CosmicGenerator/CosmicGenerator.h
@@ -99,7 +99,6 @@ private:
float m_ctcut;
float m_xlow, m_xhig, m_zlow, m_zhig, m_yval, m_IPx, m_IPy, m_IPz, m_radius, m_zpos;
float m_tmin, m_tmax;
- float m_stopped_tminus, m_stopped_tplus;
bool m_cavOpt;
int m_srOneOpt;
bool m_srOnePixECOpt;
diff --git a/Generators/CosmicGenerator/src/CosmicGenerator.cxx b/Generators/CosmicGenerator/src/CosmicGenerator.cxx
index 7299b573f88..b5ba5f50da4 100644
--- a/Generators/CosmicGenerator/src/CosmicGenerator.cxx
+++ b/Generators/CosmicGenerator/src/CosmicGenerator.cxx
@@ -81,8 +81,6 @@ extern "C" float cosmicrndm_(int* /*dummy*/)
CosmicGenerator::CosmicGenerator(const std::string& name,
ISvcLocator* pSvcLocator)
: GenModule(name,pSvcLocator)
- , m_stopped_tminus(0.)
- , m_stopped_tplus(0.)
//--------------------------------------------------------------------------
{
//
diff --git a/Generators/CosmicGenerator/src/CosmicGun.cxx b/Generators/CosmicGenerator/src/CosmicGun.cxx
index c07d14453b0..4af7a5dd349 100644
--- a/Generators/CosmicGenerator/src/CosmicGun.cxx
+++ b/Generators/CosmicGenerator/src/CosmicGun.cxx
@@ -27,7 +27,7 @@ struct genpar {
int NBIN;
float PROBE[100];
};
-genpar genpar_;
+alignas(32) genpar genpar_;
struct coscut {
float ctcut;
diff --git a/Generators/CosmicGenerator/src/cosmic2.f b/Generators/CosmicGenerator/src/cosmic2.f
index db489c54c62..0b07e1b353f 100644
--- a/Generators/CosmicGenerator/src/cosmic2.f
+++ b/Generators/CosmicGenerator/src/cosmic2.f
@@ -332,7 +332,6 @@ C
IF( ENER.LT.EMIN ) GOTO 999
IF( ENER.GT.EMAX ) GOTO 999
- 998 CONTINUE
IACC = 1
C
C - Generate the azimuthal angle (PHI)
--
GitLab