Missing NULL->nullptrs

Author: EinarElen

src/SimCore/Generators/LHEPrimaryGenerator.cxx

@@ -34,7 +34,7 @@ LHEPrimaryGenerator::~LHEPrimaryGenerator() { delete reader_; }
 void LHEPrimaryGenerator::GeneratePrimaryVertex(G4Event* anEvent) {
   simcore::lhe::LHEEvent* lheEvent = reader_->readNextEvent();
 
-  if (lheEvent != NULL) {
+  if (lheEvent != nullptr) {
     G4PrimaryVertex* vertex = new G4PrimaryVertex();
     vertex->SetPosition(lheEvent->getVertex()[0], lheEvent->getVertex()[1],
                         lheEvent->getVertex()[2]);
@@ -53,7 +53,7 @@ void LHEPrimaryGenerator::GeneratePrimaryVertex(G4Event* anEvent) {
         if (particle->getIDUP() == -623) { /* Tungsten ion */
           G4ParticleDefinition* tungstenIonDef =
               G4IonTable::GetIonTable()->GetIon(74, 184, 0.);
-          if (tungstenIonDef != NULL) {
+          if (tungstenIonDef != nullptr) {
             primary->SetParticleDefinition(tungstenIonDef);
           } else {
             EXCEPTION_RAISE("EventGenerator",
@@ -79,10 +79,10 @@ void LHEPrimaryGenerator::GeneratePrimaryVertex(G4Event* anEvent) {
          * Assign primary as daughter but only if the mother is not a DOC
          * particle.
          */
-        if (particle->getMother(0) != NULL &&
+        if (particle->getMother(0) != nullptr &&
             particle->getMother(0)->getISTUP() > 0) {
           G4PrimaryParticle* primaryMom = particleMap[particle->getMother(0)];
-          if (primaryMom != NULL) {
+          if (primaryMom != nullptr) {
             primaryMom->SetDaughter(primary);
           }
         } else {

src/SimCore/Geo/AuxInfoReader.cxx

@@ -81,7 +81,7 @@ void AuxInfoReader::assignAuxInfoToVolumes() {
           G4String magFieldName = auxVal;
           G4MagneticField* magField =
               MagneticFieldStore::getInstance()->getMagneticField(magFieldName);
-          if (magField != NULL) {
+          if (magField != nullptr) {
             G4FieldManager* mgr = new G4FieldManager(magField);
             lv->SetFieldManager(mgr, true /* FIXME: hard-coded to force field manager to daughters */);
             // G4cout << "Assigned magnetic field " << magFieldName << " to
@@ -96,7 +96,7 @@ void AuxInfoReader::assignAuxInfoToVolumes() {
           G4String regionName = auxVal;
           G4Region* region =
               G4RegionStore::GetInstance()->GetRegion(regionName);
-          if (region != NULL) {
+          if (region != nullptr) {
             region->AddRootLogicalVolume(lv);
             // G4cout << "Added volume " << lv->GetName() << " to region " <<
             // regionName << G4endl;
@@ -109,7 +109,7 @@ void AuxInfoReader::assignAuxInfoToVolumes() {
           G4String visName = auxVal;
           G4VisAttributes* visAttributes =
               VisAttributesStore::getInstance()->getVisAttributes(visName);
-          if (visAttributes != NULL) {
+          if (visAttributes != nullptr) {
             lv->SetVisAttributes(visAttributes);
             // G4cout << "Assigned VisAttributes " << visName << " to volume "
             // << lv->GetName() << G4endl;
@@ -145,7 +145,7 @@ void AuxInfoReader::createMagneticField(G4String magFieldName,
                     "Missing MagFieldType for magnetic field definition.");
   }
 
-  G4MagneticField* magField = NULL;
+  G4MagneticField* magField = nullptr;
 
   // Create a uniform mag field using the built-in Geant4 type.
   if (magFieldType == "G4UniformMagField") {

src/SimCore/TrackMap.cxx

@@ -37,10 +37,10 @@ void TrackMap::save(const G4Track* track) {
   particle.setGenStatus(0);
 
   // Update the gen status from the primary particle.
-  if (track->GetDynamicParticle()->GetPrimaryParticle() != NULL) {
+  if (track->GetDynamicParticle()->GetPrimaryParticle() != nullptr) {
     G4VUserPrimaryParticleInformation* primaryInfo =
         track->GetDynamicParticle()->GetPrimaryParticle()->GetUserInformation();
-    if (primaryInfo != NULL) {
+    if (primaryInfo != nullptr) {
       particle.setGenStatus(
           ((UserPrimaryParticleInformation*)primaryInfo)->getHepEvtStatus());
     }