|
22 | 22 | #define COMMON_TOOLS_PID_PIDTPCMODULE_H_ |
23 | 23 |
|
24 | 24 | #include "Common/CCDB/ctpRateFetcher.h" |
| 25 | +#include "Common/Core/CollisionTypeHelper.h" |
25 | 26 | #include "Common/Core/PID/TPCPIDResponse.h" |
26 | 27 | #include "Common/Core/TableHelper.h" |
27 | | -#include "Common/Core/CollisionTypeHelper.h" |
28 | 28 | #include "Common/DataModel/PIDResponseTPC.h" |
29 | 29 | #include "Common/TableProducer/PID/pidTPCBase.h" |
30 | 30 | #include "Tools/ML/model.h" |
@@ -132,7 +132,7 @@ struct pidTPCConfigurables : o2::framework::ConfigurableGroup { |
132 | 132 | o2::framework::Configurable<int> useNetworkAl{"useNetworkAl", 1, {"Switch for applying neural network on the alpha mass hypothesis (if network enabled) (set to 0 to disable)"}}; |
133 | 133 | o2::framework::Configurable<float> networkBetaGammaCutoff{"networkBetaGammaCutoff", 0.45, {"Lower value of beta-gamma to override the NN application"}}; |
134 | 134 | o2::framework::Configurable<std::string> cfgPathGrpLhcIf{"ccdb-path-grplhcif", "GLO/Config/GRPLHCIF", "Path on the CCDB for the GRPLHCIF object"}; |
135 | | - }; |
| 135 | +}; |
136 | 136 |
|
137 | 137 | // helper getter - FIXME should be separate |
138 | 138 | int getPIDIndex(const int pdgCode) // Get O2 PID index corresponding to MC PDG code |
@@ -330,7 +330,7 @@ class pidTPCModule |
330 | 330 | o2::parameters::GRPLHCIFData* grpo = ccdb->template getForTimeStamp<o2::parameters::GRPLHCIFData>(pidTPCopts.cfgPathGrpLhcIf.value, time); |
331 | 331 | LOG(info) << " collision type::" << CollisionSystemType::getCollisionTypeFromGrp(grpo); |
332 | 332 | collsys = CollisionSystemType::getCollisionTypeFromGrp(grpo); |
333 | | - if ( collsys == CollisionSystemType::kCollSyspp ) { |
| 333 | + if (collsys == CollisionSystemType::kCollSyspp) { |
334 | 334 | irSource = "T0VTX"; |
335 | 335 | } else { |
336 | 336 | irSource = "ZNC hadronic"; |
@@ -412,7 +412,7 @@ class pidTPCModule |
412 | 412 | o2::parameters::GRPLHCIFData* grpo = ccdb->template getForTimeStamp<o2::parameters::GRPLHCIFData>(pidTPCopts.cfgPathGrpLhcIf.value, bc.timestamp()); |
413 | 413 | LOG(info) << "Collision type::" << CollisionSystemType::getCollisionTypeFromGrp(grpo); |
414 | 414 | int collsys = CollisionSystemType::getCollisionTypeFromGrp(grpo); |
415 | | - if (collsys == CollisionSystemType::kCollSyspp ) { |
| 415 | + if (collsys == CollisionSystemType::kCollSyspp) { |
416 | 416 | irSource = "T0VTX"; |
417 | 417 | } else { |
418 | 418 | irSource = "ZNC hadronic"; |
@@ -481,9 +481,9 @@ class pidTPCModule |
481 | 481 | hadronicRate = mRateFetcher.fetch(ccdb.service, trk_bc.timestamp(), trk_bc.runNumber(), irSource) * 1.e-3; |
482 | 482 | } |
483 | 483 | timeStamp_bcOld = trk_bc.timestamp(); |
484 | | - if( collsys == CollisionSystemType::kCollSyspp ) { |
| 484 | + if (collsys == CollisionSystemType::kCollSyspp) { |
485 | 485 | track_properties[counter_track_props + 7] = hadronicRate / 1500.; |
486 | | - }else{ |
| 486 | + } else { |
487 | 487 | track_properties[counter_track_props + 7] = hadronicRate / 50.; |
488 | 488 | } |
489 | 489 | } else { |
@@ -762,10 +762,10 @@ class pidTPCModule |
762 | 762 | } |
763 | 763 | } |
764 | 764 | LOG(info) << "Successfully retrieved TPC PID object from CCDB for timestamp " << bc.timestamp() << ", period " << headers["LPMProductionTag"] << ", recoPass " << headers["RecoPassName"]; |
765 | | - o2::parameters::GRPLHCIFData* grpo = ccdb->template getForTimeStamp<o2::parameters::GRPLHCIFData>(pidTPCopts.cfgPathGrpLhcIf.value,bc.timestamp()); |
| 765 | + o2::parameters::GRPLHCIFData* grpo = ccdb->template getForTimeStamp<o2::parameters::GRPLHCIFData>(pidTPCopts.cfgPathGrpLhcIf.value, bc.timestamp()); |
766 | 766 | LOG(info) << "Collisions type::" << CollisionSystemType::getCollisionTypeFromGrp(grpo); |
767 | 767 | int collsys = CollisionSystemType::getCollisionTypeFromGrp(grpo); |
768 | | - if (collsys == CollisionSystemType::kCollSyspp ) { |
| 768 | + if (collsys == CollisionSystemType::kCollSyspp) { |
769 | 769 | irSource = "T0VTX"; |
770 | 770 | } else { |
771 | 771 | irSource = "ZNC hadronic"; |
|
0 commit comments