Merge pull request AliceO2Group#10 from alibuild/alibot-cleanup-6224

cortesep · web-flow · commit ee23b5ef55fa · 2021-05-21T10:23:32.000+02:00
Please consider the following formatting changes to AliceO2Group#6224
diff --git a/Detectors/ZDC/macro/CreateIntegrationParam.C b/Detectors/ZDC/macro/CreateIntegrationParam.C
@@ -24,7 +24,7 @@ using namespace o2::zdc;
 using namespace std;
 
 void CreateIntegrationParam(long tmin = 0, long tmax = -1,
-                        std::string ccdbHost = "http://ccdb-test.cern.ch:8080")
+                            std::string ccdbHost = "http://ccdb-test.cern.ch:8080")
 {
 
   ZDCIntegrationParam conf;
diff --git a/Detectors/ZDC/reconstruction/include/ZDCReconstruction/ZDCEnergyParam.h b/Detectors/ZDC/reconstruction/include/ZDCReconstruction/ZDCEnergyParam.h
@@ -26,7 +26,7 @@ namespace zdc
 // parameters of ZDC reconstruction
 
 struct ZDCEnergyParam {
-  //std::array<float, NTDCChannels> tdcShift{} 
+  //std::array<float, NTDCChannels> tdcShift{}
   float tdc_shift[NTDCChannels] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; // Correction of TDC position (ns)
   void setShift(uint32_t ich, float val);
   float getShift(uint32_t ich) const;
diff --git a/Detectors/ZDC/reconstruction/include/ZDCReconstruction/ZDCTDCParam.h b/Detectors/ZDC/reconstruction/include/ZDCReconstruction/ZDCTDCParam.h
@@ -26,7 +26,7 @@ namespace zdc
 // parameters of ZDC reconstruction
 
 struct ZDCTDCParam {
-  //std::array<float, NTDCChannels> tdcShift{} 
+  //std::array<float, NTDCChannels> tdcShift{}
   float tdc_shift[NTDCChannels] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; // Correction of TDC position (ns)
   void setShift(uint32_t ich, float val);
   float getShift(uint32_t ich) const;
diff --git a/Detectors/ZDC/reconstruction/src/RecoParamZDC.cxx b/Detectors/ZDC/reconstruction/src/RecoParamZDC.cxx
@@ -15,10 +15,11 @@ using namespace o2::zdc;
 
 O2ParamImpl(RecoParamZDC);
 
-void RecoParamZDC::setBit(uint32_t ibit, bool val){
-  if(ibit>=0 && ibit<NTDCChannels){
-    bitset[ibit]=val;
-  }else{
+void RecoParamZDC::setBit(uint32_t ibit, bool val)
+{
+  if (ibit >= 0 && ibit < NTDCChannels) {
+    bitset[ibit] = val;
+  } else {
     LOG(FATAL) << __func__ << " bit " << ibit << " not in allowed range";
   }
 }
diff --git a/Detectors/ZDC/reconstruction/src/ZDCIntegrationParam.cxx b/Detectors/ZDC/reconstruction/src/ZDCIntegrationParam.cxx
@@ -44,6 +44,6 @@ void ZDCIntegrationParam::setIntegration(uint32_t ich, int beg, int end, int beg
 void ZDCIntegrationParam::print()
 {
   for (Int_t ich = 0; ich < NChannels; ich++) {
-    LOG(INFO) << ChannelNames[ich] << " integration: signal=[" << beg_int[ich] << ":" << end_int[ich] << "] pedestal=[" << beg_ped_int[ich] << ":" << end_ped_int[ich] <<"]";
+    LOG(INFO) << ChannelNames[ich] << " integration: signal=[" << beg_int[ich] << ":" << end_int[ich] << "] pedestal=[" << beg_ped_int[ich] << ":" << end_ped_int[ich] << "]";
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ using namespace o2::zdc;`
`24`	`24`	`using namespace std;`
`25`	`25`
`26`	`26`	`void CreateIntegrationParam(long tmin = 0, long tmax = -1,`
`27`		`- std::string ccdbHost = "http://ccdb-test.cern.ch:8080")`
	`27`	`+ std::string ccdbHost = "http://ccdb-test.cern.ch:8080")`
`28`	`28`	`{`
`29`	`29`
`30`	`30`	`ZDCIntegrationParam conf;`
Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,11 @@ using namespace o2::zdc;`
`15`	`15`
`16`	`16`	`O2ParamImpl(RecoParamZDC);`
`17`	`17`
`18`		`-void RecoParamZDC::setBit(uint32_t ibit, bool val){`
`19`		`- if(ibit>=0 && ibit<NTDCChannels){`
`20`		`- bitset[ibit]=val;`
`21`		`- }else{`
	`18`	`+void RecoParamZDC::setBit(uint32_t ibit, bool val)`
	`19`	`+{`
	`20`	`+ if (ibit >= 0 && ibit < NTDCChannels) {`
	`21`	`+ bitset[ibit] = val;`
	`22`	`+ } else {`
`22`	`23`	`LOG(FATAL) << __func__ << " bit " << ibit << " not in allowed range";`
`23`	`24`	`}`
`24`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,6 @@ void ZDCIntegrationParam::setIntegration(uint32_t ich, int beg, int end, int beg`
`44`	`44`	`void ZDCIntegrationParam::print()`
`45`	`45`	`{`
`46`	`46`	`for (Int_t ich = 0; ich < NChannels; ich++) {`
`47`		`- LOG(INFO) << ChannelNames[ich] << " integration: signal=[" << beg_int[ich] << ":" << end_int[ich] << "] pedestal=[" << beg_ped_int[ich] << ":" << end_ped_int[ich] <<"]";`
	`47`	`+ LOG(INFO) << ChannelNames[ich] << " integration: signal=[" << beg_int[ich] << ":" << end_int[ich] << "] pedestal=[" << beg_ped_int[ich] << ":" << end_ped_int[ich] << "]";`
`48`	`48`	`}`
`49`	`49`	`}`