more clean code

cms-sw · Jan 21, 2022 · a4ef2e9 · a4ef2e9
1 parent f493738
commit a4ef2e9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/SimG4Core/Notification/src/GenParticleInfoExtractor.cc b/SimG4Core/Notification/src/GenParticleInfoExtractor.cc
@@ -9,13 +9,11 @@ const GenParticleInfo &GenParticleInfoExtractor::operator()(const G4PrimaryParti
                 "mc001",
                 FatalException,
                 "GenParticleInfoExtractor: G4PrimaryParticle has no user information");
-  } else {
-    GenParticleInfo *gpi = dynamic_cast<GenParticleInfo *>(up);
-    if (gpi == nullptr)
-      G4Exception("SimG4Core/Notification",
-                  "mc001",
-                  FatalException,
-                  "GenParticleInfoExtractor: user information in G4PrimaryParticle is not of GenParticleInfo type");
+  } else if (gpi == nullptr) {
+    G4Exception("SimG4Core/Notification",
+                "mc001",
+                FatalException,
+                "GenParticleInfoExtractor: user information in G4PrimaryParticle is not of GenParticleInfo type");
   }
   return *gpi;
 }
diff --git a/SimG4Core/Notification/src/TrackInformationExtractor.cc b/SimG4Core/Notification/src/TrackInformationExtractor.cc
@@ -7,9 +7,8 @@ const TrackInformation &TrackInformationExtractor::operator()(const G4Track &gtk
   const TrackInformation *tkInfo = dynamic_cast<const TrackInformation *>(gui);
   if (gui == nullptr) {
     missing(gtk);
-  } else {
-    if (tkInfo == nullptr)
-      wrongType();
+  } else if (tkInfo == nullptr) {
+    wrongType();
   }
   return *tkInfo;
 }
@@ -19,9 +18,8 @@ TrackInformation &TrackInformationExtractor::operator()(G4Track &gtk) const {
   TrackInformation *tkInfo = dynamic_cast<TrackInformation *>(gui);
   if (gui == nullptr) {
     missing(gtk);
-  } else {
-    if (tkInfo == nullptr)
-      wrongType();
+  } else if (tkInfo == nullptr) {
+    wrongType();
   }
   return *tkInfo;
 }