Merge pull request #45909 from smuzaffar/simulation-upgrade-llvm18-clang-format

cmsbuild · web-flow · commit 0c60433c19f0 · 2024-09-06T12:09:05.000+02:00
[SIMULATION-UPGRADE] Changes suggested by new llvm18 clang-format
diff --git a/DataFormats/GEMDigi/interface/GEMAMC.h b/DataFormats/GEMDigi/interface/GEMAMC.h
@@ -93,7 +93,7 @@ class GEMAMC {
     };
   };
 
-  GEMAMC() : amch1_(0), amch2_(0), amct_(0), eh_(0), et_(0){};
+  GEMAMC() : amch1_(0), amch2_(0), amct_(0), eh_(0), et_(0) {}
   ~GEMAMC() { gebd_.clear(); }
 
   int status();
diff --git a/DataFormats/GEMDigi/interface/GEMOptoHybrid.h b/DataFormats/GEMDigi/interface/GEMOptoHybrid.h
@@ -73,7 +73,7 @@ class GEMOptoHybrid {
     };
   };
 
-  GEMOptoHybrid() : ch_(0), ct_(0), existVFATs_(0){};
+  GEMOptoHybrid() : ch_(0), ct_(0), existVFATs_(0) {}
   ~GEMOptoHybrid() { vfatd_.clear(); }
 
   void setVersion(uint8_t i) { ver_ = i; }
diff --git a/SimCalorimetry/HGCalAssociatorProducers/plugins/LCToCPAssociatorByEnergyScoreImpl.cc b/SimCalorimetry/HGCalAssociatorProducers/plugins/LCToCPAssociatorByEnergyScoreImpl.cc
@@ -193,7 +193,7 @@ ticl::association LCToCPAssociatorByEnergyScoreImpl<HIT>::makeConnections(
         }
       }
     }  // End loop over hits on a LayerCluster
-  }    // End of loop over LayerClusters
+  }  // End of loop over LayerClusters
 
 #ifdef EDM_ML_DEBUG
   for (unsigned int lcId = 0; lcId < nLayerClusters; ++lcId) {
@@ -395,7 +395,7 @@ ticl::association LCToCPAssociatorByEnergyScoreImpl<HIT>::makeConnections(
         cpPair.second += std::min(std::pow(rhFraction - cpFraction, 2), std::pow(rhFraction, 2)) * hitEnergyWeight *
                          invLayerClusterEnergyWeight;
       }  //End of loop over CaloParticles related the this LayerCluster.
-    }    // End of loop over Hits within a LayerCluster
+    }  // End of loop over Hits within a LayerCluster
 #ifdef EDM_ML_DEBUG
     if (cpsInLayerCluster[lcId].empty())
       LogDebug("LCToCPAssociatorByEnergyScoreImpl") << "layerCluster Id: \t" << lcId << "\tCP id:\t-1 "
@@ -476,7 +476,7 @@ ticl::association LCToCPAssociatorByEnergyScoreImpl<HIT>::makeConnections(
               << "invCPEnergyWeight:\t" << invCPEnergyWeight << "\n";
 #endif
         }  // End of loop over LayerClusters linked to hits of this CaloParticle
-      }    // End of loop over hits of CaloParticle on a Layer
+      }  // End of loop over hits of CaloParticle on a Layer
 #ifdef EDM_ML_DEBUG
       if (cPOnLayer[cpId][layerId].layerClusterIdToEnergyAndScore.empty())
         LogDebug("LCToCPAssociatorByEnergyScoreImpl") << "CP Id: \t" << cpId << "\tLC id:\t-1 "
@@ -490,7 +490,7 @@ ticl::association LCToCPAssociatorByEnergyScoreImpl<HIT>::makeConnections(
       }
 #endif
     }  // End of loop over layers
-  }    // End of loop over CaloParticles
+  }  // End of loop over CaloParticles
 
   return {cpsInLayerCluster, cPOnLayer};
 }
diff --git a/SimCalorimetry/HGCalAssociatorProducers/plugins/LCToSCAssociatorByEnergyScoreImpl.cc b/SimCalorimetry/HGCalAssociatorProducers/plugins/LCToSCAssociatorByEnergyScoreImpl.cc
@@ -182,7 +182,7 @@ ticl::association LCToSCAssociatorByEnergyScoreImpl<HIT>::makeConnections(
         }
       }
     }  // End loop over hits on a LayerCluster
-  }    // End of loop over LayerClusters
+  }  // End of loop over LayerClusters
 
 #ifdef EDM_ML_DEBUG
   for (unsigned int lcId = 0; lcId < nLayerClusters; ++lcId) {
@@ -492,7 +492,7 @@ ticl::association LCToSCAssociatorByEnergyScoreImpl<HIT>::makeConnections(
               << "invSCEnergyWeight:\t" << invSCEnergyWeight << "\n";
 #endif
         }  // End of loop over LayerClusters linked to hits of this SimCluster
-      }    // End of loop over hits of SimCluster on a Layer
+      }  // End of loop over hits of SimCluster on a Layer
 #ifdef EDM_ML_DEBUG
       if (lcsInSimCluster[scId][layerId].layerClusterIdToEnergyAndScore.empty())
         LogDebug("LCToSCAssociatorByEnergyScoreImpl") << "SC Id: \t" << scId << "\tLC id:\t-1 "
@@ -507,7 +507,7 @@ ticl::association LCToSCAssociatorByEnergyScoreImpl<HIT>::makeConnections(
       }
 #endif
     }  // End of loop over layers
-  }    // End of loop over SimClusters
+  }  // End of loop over SimClusters
 
   return {scsInLayerCluster, lcsInSimCluster};
 }
diff --git a/SimCalorimetry/HGCalAssociatorProducers/plugins/LCToSimTSAssociatorByEnergyScoreImpl.cc b/SimCalorimetry/HGCalAssociatorProducers/plugins/LCToSimTSAssociatorByEnergyScoreImpl.cc
@@ -84,7 +84,7 @@ ticl::RecoToSimTracksterCollection LCToSimTSAssociatorByEnergyScoreImpl::associa
             << " is neither a CaloParticle nor a SimCluster!\n";
       }
     }  // end loop over simTracksters
-  }    // end loop over layerClusters
+  }  // end loop over layerClusters
 
   return returnValue;
 }
diff --git a/SimCalorimetry/HGCalAssociatorProducers/plugins/MultiClusterAssociatorByEnergyScoreImpl.cc b/SimCalorimetry/HGCalAssociatorProducers/plugins/MultiClusterAssociatorByEnergyScoreImpl.cc
@@ -116,8 +116,8 @@ hgcal::association MultiClusterAssociatorByEnergyScoreImpl::makeConnections(
           }
         }
       }  // end of loop through simHits
-    }    // end of loop through simclusters
-  }      // end of loop through caloParticles
+    }  // end of loop through simclusters
+  }  // end of loop through caloParticles
 
 #ifdef EDM_ML_DEBUG
   LogDebug("MultiClusterAssociatorByEnergyScoreImpl") << "cPOnLayer INFO" << std::endl;
@@ -483,7 +483,7 @@ hgcal::association MultiClusterAssociatorByEnergyScoreImpl::makeConnections(
                                      << "\tcurrent score numerator:\t" << mcPair.second.second << "\n";
 #endif
         }  // End of loop over MultiClusters linked to hits of this CaloParticle
-      }    // End of loop over hits of CaloParticle on a Layer
+      }  // End of loop over hits of CaloParticle on a Layer
 #ifdef EDM_ML_DEBUG
       if (cPOnLayer[cpId][layerId].multiClusterIdToEnergyAndScore.empty())
         LogDebug("HGCalValidator") << "CP Id: \t" << cpId << "\t MCL id:\t-1 "
diff --git a/SimCalorimetry/HGCalAssociatorProducers/plugins/TSToSCAssociatorByEnergyScoreImpl.cc b/SimCalorimetry/HGCalAssociatorProducers/plugins/TSToSCAssociatorByEnergyScoreImpl.cc
@@ -156,8 +156,8 @@ ticl::association TSToSCAssociatorByEnergyScoreImpl::makeConnections(
           }
         }
       }  // End loop over hits on a LayerCluster
-    }    // End loop over LayerClusters in Trackster
-  }      // End of loop over Tracksters
+    }  // End loop over LayerClusters in Trackster
+  }  // End of loop over Tracksters
 
 #ifdef EDM_ML_DEBUG
   for (unsigned int tsId = 0; tsId < nTracksters; ++tsId) {
@@ -273,7 +273,7 @@ ticl::association TSToSCAssociatorByEnergyScoreImpl::makeConnections(
           << maxEnergySharedLCandSC << "\t" << std::setw(22) << totalSCEnergyOnLayer << "\t" << std::setw(22)
           << energyFractionOfLCinSC << "\t" << std::setw(25) << energyFractionOfSCinLC << "\n";
     }  // End of loop over LayerClusters in Trackster
-  }    // End of loop over Tracksters
+  }  // End of loop over Tracksters
 
   LogDebug("TSToSCAssociatorByEnergyScoreImpl")
       << "Improved tssInSimCluster INFO (Now containing the linked tracksters id and energy - score still empty)"
@@ -383,7 +383,7 @@ ticl::association TSToSCAssociatorByEnergyScoreImpl::makeConnections(
 #endif
         }
       }  // End of loop over Hits within a LayerCluster
-    }    // End of loop over LayerClusters in Trackster
+    }  // End of loop over LayerClusters in Trackster
 
 #ifdef EDM_ML_DEBUG
     if (scsInTrackster[tsId].empty())
@@ -471,8 +471,8 @@ ticl::association TSToSCAssociatorByEnergyScoreImpl::makeConnections(
               << "invSCEnergyWeight:\t" << invSCEnergyWeight << "\n";
 #endif
         }  // End of loop over Trackster's LayerClusters
-      }    // End of loop over Tracksters linked to hits of this SimCluster
-    }      // End of loop over hits of SimCluster on a Layer
+      }  // End of loop over Tracksters linked to hits of this SimCluster
+    }  // End of loop over hits of SimCluster on a Layer
 #ifdef EDM_ML_DEBUG
     if (tssInSimCluster[scId].tracksterIdToEnergyAndScore.empty())
       LogDebug("TSToSCAssociatorByEnergyScoreImpl") << "SC Id:\t" << scId << "\tTS id:\t-1 "
diff --git a/SimCalorimetry/HGCalAssociatorProducers/plugins/TSToSimTSAssociatorByEnergyScoreImpl.cc b/SimCalorimetry/HGCalAssociatorProducers/plugins/TSToSimTSAssociatorByEnergyScoreImpl.cc
@@ -137,7 +137,7 @@ ticl::association TSToSimTSAssociatorByEnergyScoreImpl::makeConnections(
         }
       }
     }  // End loop over LayerClusters in Trackster
-  }    // End of loop over Tracksters
+  }  // End of loop over Tracksters
 
 #ifdef EDM_ML_DEBUG
   for (unsigned int tsId = 0; tsId < nTracksters; ++tsId) {
@@ -249,7 +249,7 @@ ticl::association TSToSimTSAssociatorByEnergyScoreImpl::makeConnections(
           << maxEnergySharedLCandST << "\t" << std::setw(22) << totalSTEnergyOnLayer << "\t" << std::setw(22)
           << energyFractionOfLCinST << "\t" << std::setw(25) << energyFractionOfSTinLC << "\n";
     }  // End of loop over LayerClusters in Trackster
-  }    // End of loop over Tracksters
+  }  // End of loop over Tracksters
 
   LogDebug("TSToSimTSAssociatorByEnergyScoreImpl")
       << "Improved tssInSimTrackster INFO (Now containing the linked tracksters id and energy - score still empty)"
@@ -422,8 +422,8 @@ ticl::association TSToSimTSAssociatorByEnergyScoreImpl::makeConnections(
               << "invSTEnergyWeight:\t" << invSTEnergyWeight << "\n";
 #endif
         }  // End of loop over Trackster's LayerClusters
-      }    // End of loop over Tracksters linked to hits of this SimTrackster
-    }      // End of loop over hits of SimTrackster on a Layer
+      }  // End of loop over Tracksters linked to hits of this SimTrackster
+    }  // End of loop over hits of SimTrackster on a Layer
 #ifdef EDM_ML_DEBUG
     if (tssInSimTrackster[stId].tracksterIdToEnergyAndScore.empty())
       LogDebug("TSToSimTSAssociatorByEnergyScoreImpl") << "ST Id:\t" << stId << "\tTS id:\t-1 "
diff --git a/SimCalorimetry/HGCalSimAlgos/interface/HGCalRadiationMap.h b/SimCalorimetry/HGCalSimAlgos/interface/HGCalRadiationMap.h
@@ -20,7 +20,7 @@ class HGCalRadiationMap {
   };
 
   HGCalRadiationMap();
-  ~HGCalRadiationMap(){};
+  ~HGCalRadiationMap() {}
 
   typedef std::map<std::pair<int, int>, DoseParameters> doseParametersMap;
 
diff --git a/SimCalorimetry/HGCalSimAlgos/interface/HGCalSciNoiseMap.h b/SimCalorimetry/HGCalSimAlgos/interface/HGCalSciNoiseMap.h
@@ -43,7 +43,7 @@ class HGCalSciNoiseMap : public HGCalRadiationMap {
   };
 
   HGCalSciNoiseMap();
-  ~HGCalSciNoiseMap(){};
+  ~HGCalSciNoiseMap() {}
 
   /**
      @short returns the signal scaling and the noise
diff --git a/SimCalorimetry/HGCalSimAlgos/interface/HGCalSiNoiseMap.h b/SimCalorimetry/HGCalSimAlgos/interface/HGCalSiNoiseMap.h
@@ -34,7 +34,7 @@ class HGCalSiNoiseMap : public HGCalRadiationMap {
   };
 
   HGCalSiNoiseMap();
-  ~HGCalSiNoiseMap(){};
+  ~HGCalSiNoiseMap() {}
 
   /**
      @short set the ileak parameters to use
diff --git a/SimCalorimetry/HGCalSimProducers/interface/HGCDigitizerBase.h b/SimCalorimetry/HGCalSimProducers/interface/HGCDigitizerBase.h
@@ -109,7 +109,7 @@ class HGCDigitizerBase {
   /**
      @short DTOR
   */
-  virtual ~HGCDigitizerBase(){};
+  virtual ~HGCDigitizerBase() {}
 
 protected:
   //baseline configuration
diff --git a/SimFastTiming/MtdAssociatorProducers/plugins/MtdRecoClusterToSimLayerClusterAssociatorByHitsImpl.cc b/SimFastTiming/MtdAssociatorProducers/plugins/MtdRecoClusterToSimLayerClusterAssociatorByHitsImpl.cc
@@ -131,7 +131,7 @@ reco::RecoToSimCollectionMtd MtdRecoClusterToSimLayerClusterAssociatorByHitsImpl
         outputCollection.emplace_back(recoClusterRef, simClusterRefs);
 
       }  // -- end loop over reco clus
-    }    // -- end loop over detsetclus
+    }  // -- end loop over detsetclus
   }
 
   outputCollection.post_insert();
@@ -232,7 +232,7 @@ reco::SimToRecoCollectionMtd MtdRecoClusterToSimLayerClusterAssociatorByHitsImpl
           }
 
         }  // end loop ove reco clus
-      }    // end loop over detsets
+      }  // end loop over detsets
     }
 
     // -- Now fill the output collection
diff --git a/SimG4CMS/HGCalTestBeam/plugins/HGCalTBAnalyzer.cc b/SimG4CMS/HGCalTestBeam/plugins/HGCalTBAnalyzer.cc
@@ -785,8 +785,8 @@ void HGCalTBAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& i
         edm::LogVerbatim("HGCSim") << "HGCRecHitCollection does not exist for " << detectorFH_ << " !!!";
 #endif
       }  // else
-    }    // if (ifFH_)
-  }      // if (doRecHits_)
+    }  // if (ifFH_)
+  }  // if (doRecHits_)
 
 }  // void HGCalTBAnalyzer::analyze
 
diff --git a/SimMuon/GEMDigitizer/src/ME0PreRecoGaussianModel.cc b/SimMuon/GEMDigitizer/src/ME0PreRecoGaussianModel.cc
@@ -330,7 +330,7 @@ void ME0PreRecoGaussianModel::simulateNoise(const ME0EtaPartition* roll, CLHEP::
       }
 
     }  // end if neutral bkg
-  }    // end loop over strips (= pseudo rolls)
+  }  // end loop over strips (= pseudo rolls)
 }
 
 double ME0PreRecoGaussianModel::correctSigmaU(const ME0EtaPartition* roll, double y) {
diff --git a/SimMuon/GEMDigitizer/test/GEMDigiReader.cc b/SimMuon/GEMDigitizer/test/GEMDigiReader.cc
@@ -89,7 +89,7 @@ void GEMDigiReader::analyze(const edm::Event& event, const edm::EventSetup& even
         }
       }
     }  // for digis in layer
-  }    // for layers
+  }  // for layers
 
   for (edm::DetSetVector<StripDigiSimLink>::const_iterator itlink = thelinkDigis->begin();
        itlink != thelinkDigis->end();

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ ticl::association LCToSCAssociatorByEnergyScoreImpl<HIT>::makeConnections(`
`182`	`182`	`}`
`183`	`183`	`}`
`184`	`184`	`} // End loop over hits on a LayerCluster`
`185`		`- } // End of loop over LayerClusters`
	`185`	`+ } // End of loop over LayerClusters`
`186`	`186`
`187`	`187`	`#ifdef EDM_ML_DEBUG`
`188`	`188`	`for (unsigned int lcId = 0; lcId < nLayerClusters; ++lcId) {`
`@@ -492,7 +492,7 @@ ticl::association LCToSCAssociatorByEnergyScoreImpl<HIT>::makeConnections(`
`492`	`492`	`<< "invSCEnergyWeight:\t" << invSCEnergyWeight << "\n";`
`493`	`493`	`#endif`
`494`	`494`	`} // End of loop over LayerClusters linked to hits of this SimCluster`
`495`		`- } // End of loop over hits of SimCluster on a Layer`
	`495`	`+ } // End of loop over hits of SimCluster on a Layer`
`496`	`496`	`#ifdef EDM_ML_DEBUG`
`497`	`497`	`if (lcsInSimCluster[scId][layerId].layerClusterIdToEnergyAndScore.empty())`
`498`	`498`	`LogDebug("LCToSCAssociatorByEnergyScoreImpl") << "SC Id: \t" << scId << "\tLC id:\t-1 "`
`@@ -507,7 +507,7 @@ ticl::association LCToSCAssociatorByEnergyScoreImpl<HIT>::makeConnections(`
`507`	`507`	`}`
`508`	`508`	`#endif`
`509`	`509`	`} // End of loop over layers`
`510`		`- } // End of loop over SimClusters`
	`510`	`+ } // End of loop over SimClusters`
`511`	`511`
`512`	`512`	`return {scsInLayerCluster, lcsInSimCluster};`
`513`	`513`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ ticl::RecoToSimTracksterCollection LCToSimTSAssociatorByEnergyScoreImpl::associa`
`84`	`84`	`<< " is neither a CaloParticle nor a SimCluster!\n";`
`85`	`85`	`}`
`86`	`86`	`} // end loop over simTracksters`
`87`		`- } // end loop over layerClusters`
	`87`	`+ } // end loop over layerClusters`
`88`	`88`
`89`	`89`	`return returnValue;`
`90`	`90`	`}`