Skip to content

[Common] Please consider the following formatting changes to #14169 #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
alibuild wants to merge 1 commit into from
Closed

[Common] Please consider the following formatting changes to #14169 #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions Common/Tasks/zdcTableReader.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.

Check failure on line 1 in Common/Tasks/zdcTableReader.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/workflow-file] 

Name of a workflow file must match the name of the main struct in it (without the PWG prefix). (Class implementation files should be in "Core" directories.)
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand Down Expand Up @@ -42,12 +42,12 @@
Configurable<int> nBinsAmpZP{"nBinsAmpZP", 1025, "n bins 4 ZP amplitudes"};
Configurable<int> nBinsTDC{"nBinsTDC", 480, "n bins 4 TDCs"};
Configurable<int> nBinsFit{"nBinsFit", 1000, "n bins 4 FIT"};
Configurable<float> MaxZN{"MaxZN", 4099.5, "Max 4 ZN histos"};

Check failure on line 45 in Common/Tasks/zdcTableReader.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
Configurable<float> MaxZP{"MaxZP", 3099.5, "Max 4 ZP histos"};

Check failure on line 46 in Common/Tasks/zdcTableReader.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
Configurable<float> MaxZEM{"MaxZEM", 3099.5, "Max 4 ZEM histos"};

Check failure on line 47 in Common/Tasks/zdcTableReader.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
//
Configurable<float> MaxMultFV0{"MaxMultFV0", 3000, "Max 4 FV0 histos"};

Check failure on line 49 in Common/Tasks/zdcTableReader.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
Configurable<float> MaxMultFT0{"MaxMultFT0", 3000, "Max 4 FT0 histos"};

Check failure on line 50 in Common/Tasks/zdcTableReader.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
//
Configurable<float> enCalibZNA{"enCalibZNA", 1.0, "Energy calibration ZNA"};
Configurable<float> enCalibZNC{"enCalibZNC", 1.0, "Energy calibration ZNC"};
Expand Down Expand Up @@ -139,28 +139,27 @@
auto timestamp = zdc.timestamp();
// auto selectionBits = zdc.selectionBits();

if( enCalibZNA > 0.) {
if (enCalibZNA > 0.) {
zna *= enCalibZNA;
znaADC *= enCalibZNA;
znapm1 *= enCalibZNA;
znapm2 *= enCalibZNA;
znapm3 *= enCalibZNA;
znapm4 *= enCalibZNA;

}
if( enCalibZNC > 0.) {
if (enCalibZNC > 0.) {
znc *= enCalibZNC;
zncADC *= enCalibZNC;
zncpm1 *= enCalibZNC;
zncpm2 *= enCalibZNC;
zncpm3 *= enCalibZNC;
zncpm4 *= enCalibZNC;
}
if( enCalibZPA > 0.) {
if (enCalibZPA > 0.) {
zpa *= enCalibZPA;
zpaADC *= enCalibZPA;
}
if( enCalibZPC > 0.) {
if (enCalibZPC > 0.) {
zpc *= enCalibZPC;
zpcADC *= enCalibZPC;
}
Expand All @@ -187,8 +186,8 @@
registry.get<TH2>(HIST("hZPAvstdc"))->Fill(tdczpa, zpa);
registry.get<TH2>(HIST("hZPCvstdc"))->Fill(tdczpc, zpc);
//
registry.get<TH2>(HIST("hZNAcvsZNAsum"))->Fill(0.25*(znapm1 + znapm2 + znapm3 + znapm4), zna);
registry.get<TH2>(HIST("hZNCcvsZNCsum"))->Fill(0.25*(zncpm1 + zncpm2 + zncpm3 + zncpm4), znc);
registry.get<TH2>(HIST("hZNAcvsZNAsum"))->Fill(0.25 * (znapm1 + znapm2 + znapm3 + znapm4), zna);
registry.get<TH2>(HIST("hZNCcvsZNCsum"))->Fill(0.25 * (zncpm1 + zncpm2 + zncpm3 + zncpm4), znc);
//
registry.get<TH2>(HIST("hZNvsV0A"))->Fill(multV0A / 100., zna + znc);
registry.get<TH2>(HIST("hZNAvsFT0A"))->Fill((multFT0A) / 100., zna);
Expand All @@ -207,13 +206,13 @@
registry.get<TH2>(HIST("hZPCvscentrFT0C"))->Fill(centrFT0C, zpc);
registry.get<TH2>(HIST("hZPCvscentrFT0M"))->Fill(centrFT0M, zpc);
//
if ( tStampOffset > timestamp ) {
if (tStampOffset > timestamp) {
printf("\n\n ################# OFFSET timestamp too large!!!!!!!!!!!!!!!!!!!!!!!!!! > timestamp %llu \n\n", timestamp);

Check failure on line 210 in Common/Tasks/zdcTableReader.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[logging] 

Use O2 logging (LOG, LOGF, LOGP).
return;
}
float tsh = (timestamp/1000.) - (tStampOffset/1000.); // in hours
if ( tsh > tStampMax ) {
float tsh = (timestamp / 1000.) - (tStampOffset / 1000.); // in hours
if (tsh > tStampMax) {
printf("\n\n MAXIMUM timestamp too small!!!!!!!!!!!!!!!!!!!!!!!!!! > timestamp-offset %f \n\n", tsh);

Check failure on line 215 in Common/Tasks/zdcTableReader.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[logging] 

Use O2 logging (LOG, LOGF, LOGP).
return;
}
registry.get<TH2>(HIST("hZNAvstimestamp"))->Fill(tsh, zna);
Expand Down
Loading