From b4bfa1c8c37b62cbdd8c3b3a4305d5189d958f5a Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Fri, 15 Jul 2022 12:28:08 +0200
Subject: [PATCH] Fix python style according to Flake8
---
examples/DDG4/scripts/TestProperties.py | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/examples/DDG4/scripts/TestProperties.py b/examples/DDG4/scripts/TestProperties.py
index b368096aa..1c278e287 100644
--- a/examples/DDG4/scripts/TestProperties.py
+++ b/examples/DDG4/scripts/TestProperties.py
@@ -300,6 +300,7 @@ def run():
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
<<<<<<< HEAD
print('-------------------------------------------------------')
print(act.prop_str) # 'Hello World!'
@@ -408,6 +409,29 @@ def run():
logger.info('--> {value}'.format(value=str(act.prop_PxPyPzEVector))) # (1 * GeV,2 * GeV,3 * GeV,4 * GeV)
logger.info('--> {value}'.format(value='-------------------------------------------------------'))
>>>>>>> 17dfd548 (Fix python style according to Flake8)
+||||||| parent of 4671e80c (Fix python style according to Flake8)
+ logger.info('--> {value}'.format(value='-------------------------------------------------------'))
+ logger.info('--> {value}'.format(value=str(act.prop_str))) # 'Hello World!'
+ logger.info('--> {value}'.format(value=str(act.prop_bool))) # True
+ logger.info('--> {value}'.format(value=str(act.prop_int))) # 1234
+ logger.info('--> {value}'.format(value=str(act.prop_float))) # 1234567.8
+ logger.info('--> {value}'.format(value=str(act.prop_double))) # 1234567.8
+ logger.info('--> {value}'.format(value=str(act.prop_XYZPoint))) # (1,2,3)
+ logger.info('--> {value}'.format(value=str(act.prop_XYZVector))) # (1 * m,2 * m,3 * m)
+ logger.info('--> {value}'.format(value=str(act.prop_PxPyPzEVector))) # (1 * GeV,2 * GeV,3 * GeV,4 * GeV)
+ logger.info('--> {value}'.format(value='-------------------------------------------------------'))
+=======
+ logger.info('+{value}'.format(value='-------------------------------------------------------'))
+ logger.info('| {value}'.format(value=str(act.prop_str)))
+ logger.info('| {value}'.format(value=str(act.prop_bool)))
+ logger.info('| {value}'.format(value=str(act.prop_int)))
+ logger.info('| {value}'.format(value=str(act.prop_float)))
+ logger.info('| {value}'.format(value=str(act.prop_double)))
+ logger.info('| {value}'.format(value=str(act.prop_XYZPoint)))
+ logger.info('| {value}'.format(value=str(act.prop_XYZVector)))
+ logger.info('| {value}'.format(value=str(act.prop_PxPyPzEVector)))
+ logger.info('+{value}'.format(value='-------------------------------------------------------'))
+>>>>>>> 4671e80c (Fix python style according to Flake8)
phys = geant4.setupPhysics('FTFP_BERT')
phys.dump()
--
GitLab