Skip to content

Commit

Permalink
clang-format-15 for all remaining .C .cxx .h .hh except three ext_h10…
Browse files Browse the repository at this point in the history 
…1 files
  • Loading branch information
@inkdot7
inkdot7 committed May 6, 2023
1 parent 386bc65 commit 9a0f4b5
Show file tree
Hide file tree
Showing 102 changed files with 2,171 additions and 2,056 deletions.
2 changes: 1 addition & 1 deletion actar/FastSimulation.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include "FastSimulation.h"
#include "GarfieldG4FastSimulationModel.h"
#include "GarfieldMessenger.h"
//#include "GarfieldPhysics.h"
// #include "GarfieldPhysics.h"

#include <Random.hh>

Expand Down
10 changes: 5 additions & 5 deletions atima/R3BAtima.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ namespace R3BAtima
{
TransportResult res;

const auto invTotRatio = std::accumulate(
targetMaterial.Compounds.begin(),
targetMaterial.Compounds.end(),
0.,
[](const Double_t sum, const MaterialCompound& comp) -> Double_t { return sum + comp.Ratio; });
const auto invTotRatio = std::accumulate(targetMaterial.Compounds.begin(),
targetMaterial.Compounds.end(),
0.,
[](const Double_t sum, const MaterialCompound& comp) -> Double_t
{ return sum + comp.Ratio; });

Int_t tcompsize = 3, tcompnum = targetMaterial.Compounds.size(), pn = 2;
std::vector<Double_t> tarFortran;
Expand Down
2 changes: 1 addition & 1 deletion atima/R3BAtima.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ namespace R3BAtima
Double_t projEnergy_per_u,
const TargetMaterial& targetMaterial,
Double_t tarThickness_mm);

}; // namespace R3BAtima

#endif
4 changes: 2 additions & 2 deletions califa/test/testCalifaSimulation.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@ void testCalifaSimulation(const int nbevents = 100)
run->AddModule(cave);

// Geometry: Califa
auto calsim = new R3BCalifa("califa_full.geo.root", {0., 0., 0.});
auto calsim = new R3BCalifa("califa_full.geo.root", { 0., 0., 0. });
calsim->SelectGeometryVersion(0);
run->AddModule(calsim);

// Digitizer: Califa
auto califaDig = new R3BCalifaDigitizer();
run->AddTask(califaDig);

auto califaCal2Cluster = new R3BCalifaCrystalCal2Cluster();
califaCal2Cluster->SetCrystalThreshold(0.0001); // 100 keV
run->AddTask(califaCal2Cluster);
Expand Down
26 changes: 13 additions & 13 deletions dch/R3BDch2pDigitizer.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,23 +51,23 @@
#define PDC2_Z0 535.093884
#define PDC1_Aparm 31.000000
#define PDC1_Atilt 8.880000
//#define PDC1_Atilt -8.880000
// #define PDC1_Atilt -8.880000
#define PDC2_Aparm 31.000000
#define PDC2_Atilt -9.350000
//#define PDC2_Atilt 9.350000
// #define PDC2_Atilt 9.350000

// Dead wire areas, determined from s318 DHIT data:
#define PDC1_X_DEAD_1_LO 22.16 // cm, DHIT level, >
#define PDC1_X_DEAD_1_HI 23.55 // cm, DHIT level, <=
//#define PDC1_Y_DEAD_1_LO 13.85 //cm, DHIT level, >
//#define PDC1_Y_DEAD_1_HI 15.24 //cm, DHIT level, <=
//#define PDC1_Y_DEAD_2_LO 54.73 //cm, DHIT level, >
//#define PDC1_Y_DEAD_2_HI 55.42 //cm, DHIT level, <=
//#define PDC1_Y_DEAD_3_LO 58.88 //cm, DHIT level, >
//#define PDC1_Y_DEAD_3_HI 60.97 //cm, DHIT level, <=
//#define PDC1_Y_DEAD_4_LO 64.41 //cm, DHIT level, >
//#define PDC1_Y_DEAD_4_HI 66.50 //cm, DHIT level, <=
// update: HIT level values, translated to dhit
// #define PDC1_Y_DEAD_1_LO 13.85 //cm, DHIT level, >
// #define PDC1_Y_DEAD_1_HI 15.24 //cm, DHIT level, <=
// #define PDC1_Y_DEAD_2_LO 54.73 //cm, DHIT level, >
// #define PDC1_Y_DEAD_2_HI 55.42 //cm, DHIT level, <=
// #define PDC1_Y_DEAD_3_LO 58.88 //cm, DHIT level, >
// #define PDC1_Y_DEAD_3_HI 60.97 //cm, DHIT level, <=
// #define PDC1_Y_DEAD_4_LO 64.41 //cm, DHIT level, >
// #define PDC1_Y_DEAD_4_HI 66.50 //cm, DHIT level, <=
// update: HIT level values, translated to dhit
#define PDC1_Y_DEAD_1_LO 14.3 // cm, DHIT level, >
#define PDC1_Y_DEAD_1_HI 15.5 // cm, DHIT level, <=
#define PDC1_Y_DEAD_2_LO 54.8 // cm, DHIT level, >
Expand All @@ -83,8 +83,8 @@
#define PDC2_X_DEAD_1_HI 15.26 // cm, DHIT level, <=

// Size of active area
//#define PDC_L_X 100.0 //length of active area
//#define PDC_L_Y 80.0 //length of active area
// #define PDC_L_X 100.0 //length of active area
// #define PDC_L_Y 80.0 //length of active area
#define PDC_L_X 99.07 // x length of active area
#define PDC_L_Y 77.60 // y length of active area

Expand Down
8 changes: 4 additions & 4 deletions dch/R3BDchContFact.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@

#include "R3BDchContFact.h"

//#include "R3BDchParRootFileIo.h"
//#include "R3BDchParAsciiFileIo.h"
// #include "R3BDchParRootFileIo.h"
// #include "R3BDchParAsciiFileIo.h"
#include "R3BGeoDchPar.h"
//#include "R3BDchDigiPar.h"
// #include "R3BDchDigiPar.h"

#include "FairRuntimeDb.h"
//#include "CbmParTest.h"
// #include "CbmParTest.h"
#include "FairParAsciiFileIo.h"
#include "FairParRootFileIo.h"

Expand Down
2 changes: 1 addition & 1 deletion dch/R3BDchDigiPar.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
R3BDchDigiPar::R3BDchDigiPar(const char* name, const char* title, const char* context)
: FairParGenericSet(name, title, context)
{
R3BDchDigiPar::clear();
R3BDchDigiPar::clear();
}

void R3BDchDigiPar::putParams(FairParamList* list)
Expand Down
26 changes: 13 additions & 13 deletions dch/R3BDchDigitizer.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,23 +51,23 @@
#define PDC2_Z0 535.093884
#define PDC1_Aparm 31.000000
#define PDC1_Atilt 8.880000
//#define PDC1_Atilt -8.880000
// #define PDC1_Atilt -8.880000
#define PDC2_Aparm 31.000000
#define PDC2_Atilt -9.350000
//#define PDC2_Atilt 9.350000
// #define PDC2_Atilt 9.350000

// Dead wire areas, determined from s318 DHIT data:
#define PDC1_X_DEAD_1_LO 22.16 // cm, DHIT level, >
#define PDC1_X_DEAD_1_HI 23.55 // cm, DHIT level, <=
//#define PDC1_Y_DEAD_1_LO 13.85 //cm, DHIT level, >
//#define PDC1_Y_DEAD_1_HI 15.24 //cm, DHIT level, <=
//#define PDC1_Y_DEAD_2_LO 54.73 //cm, DHIT level, >
//#define PDC1_Y_DEAD_2_HI 55.42 //cm, DHIT level, <=
//#define PDC1_Y_DEAD_3_LO 58.88 //cm, DHIT level, >
//#define PDC1_Y_DEAD_3_HI 60.97 //cm, DHIT level, <=
//#define PDC1_Y_DEAD_4_LO 64.41 //cm, DHIT level, >
//#define PDC1_Y_DEAD_4_HI 66.50 //cm, DHIT level, <=
// update: HIT level values, translated to dhit
// #define PDC1_Y_DEAD_1_LO 13.85 //cm, DHIT level, >
// #define PDC1_Y_DEAD_1_HI 15.24 //cm, DHIT level, <=
// #define PDC1_Y_DEAD_2_LO 54.73 //cm, DHIT level, >
// #define PDC1_Y_DEAD_2_HI 55.42 //cm, DHIT level, <=
// #define PDC1_Y_DEAD_3_LO 58.88 //cm, DHIT level, >
// #define PDC1_Y_DEAD_3_HI 60.97 //cm, DHIT level, <=
// #define PDC1_Y_DEAD_4_LO 64.41 //cm, DHIT level, >
// #define PDC1_Y_DEAD_4_HI 66.50 //cm, DHIT level, <=
// update: HIT level values, translated to dhit
#define PDC1_Y_DEAD_1_LO 14.3 // cm, DHIT level, >
#define PDC1_Y_DEAD_1_HI 15.5 // cm, DHIT level, <=
#define PDC1_Y_DEAD_2_LO 54.8 // cm, DHIT level, >
Expand All @@ -83,8 +83,8 @@
#define PDC2_X_DEAD_1_HI 15.26 // cm, DHIT level, <=

// Size of active area
//#define PDC_L_X 100.0 //length of active area
//#define PDC_L_Y 80.0 //length of active area
// #define PDC_L_X 100.0 //length of active area
// #define PDC_L_Y 80.0 //length of active area
#define PDC_L_X 99.07 // x length of active area
#define PDC_L_Y 77.60 // y length of active area

Expand Down
2 changes: 1 addition & 1 deletion epics/R3BChannelAccessEPICS.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
#ifndef __R3BROOT__R3BCHANNELACCESSEPICS__
#define __R3BROOT__R3BCHANNELACCESSEPICS__

#include <TClonesArray.h>
#include "R3BChannelAccess.h"
#include <TClonesArray.h>
#include <cadef.h>

class R3BChannelAccessEPICS : public R3BChannelAccess
Expand Down
Loading

0 comments on commit 9a0f4b5

Please sign in to comment.