From 9a0f4b5d74dcc108e965ccda0a6a68655c38c51c Mon Sep 17 00:00:00 2001 From: Haakan Johansson Date: Sat, 6 May 2023 19:16:10 +0000 Subject: [PATCH] clang-format-15 for all remaining .C .cxx .h .hh except three ext_h101 files --- actar/FastSimulation.cxx | 2 +- atima/R3BAtima.cxx | 10 +- atima/R3BAtima.h | 2 +- califa/test/testCalifaSimulation.C | 4 +- dch/R3BDch2pDigitizer.cxx | 26 +- dch/R3BDchContFact.cxx | 8 +- dch/R3BDchDigiPar.cxx | 2 +- dch/R3BDchDigitizer.cxx | 26 +- epics/R3BChannelAccessEPICS.h | 2 +- fiber/bunched/R3BBunchedFiberCal2Hit.cxx | 286 ++--- fiber/bunched/R3BBunchedFiberCal2Hit.h | 2 +- fiber/bunched/R3BBunchedFiberCal2Hit_s494.h | 2 +- .../R3BBunchedFiberSPMTTrigMapped2Cal.h | 2 +- fiber/mapmt/R3BFiberMAPMTCal2Hit.cxx | 2 +- fiber/mapmt/R3BFiberMAPMTCal2Hit.h | 2 +- fiber/mapmt/R3BFiberMAPMTMapped2Cal.h | 2 +- fiber/pars/R3BFiberMAPMTHitModulePar.cxx | 6 +- gconfig/g4GarfieldConfig.C | 78 +- gfi/R3BGfiContFact.cxx | 8 +- input/p2p/ana_file.C | 57 +- input/p2p/info/headers.hh | 40 +- input/p2p/info/info.hh | 35 +- input/p2p/info/libs.hh | 32 +- input/p2p/info/tree.hh | 82 +- input/p2p/libs.hh | 30 +- input/p2p/qfs.C | 2 +- land/R3BLandContFact.cxx | 4 +- los/R3BLosProvideTStart.cxx | 39 +- los/R3BLosProvideTStart.h | 13 +- los/calib/R3BLosCal2Hit.cxx | 16 +- los/calib/R3BLosTCal2Hit.cxx | 5 +- los/calib/R3BLosTCal2Hit.h | 10 +- los/online/R3BLosOnlineSpectra.cxx | 40 +- los/params/R3BLosCal2HitPar.cxx | 16 +- los/params/R3BLosHitPar.cxx | 20 +- los/params/R3BLosHitPar.h | 3 +- lumon/ELILuMonContFact.cxx | 8 +- mtof/R3BmTofContFact.cxx | 8 +- neuland/calibration/R3BNeulandHitModulePar.h | 2 +- neuland/calibration/R3BNeulandHitPar.h | 5 +- neuland/calibration/R3BNeulandMapped2CalPar.h | 2 +- neuland/calibration/R3BNeulandParFact.cxx | 2 +- neuland/calibration/R3BNeulandTSyncer.cxx | 5 +- .../clustering/R3BNeulandClusterFinder.cxx | 12 +- neuland/clustering/R3BNeulandClusterFinder.h | 2 +- neuland/clustering/R3BNeulandClusterMon.cxx | 6 +- neuland/digitizing/DigitizingEngine.cxx | 15 +- neuland/digitizing/DigitizingTacQuila.h | 4 +- neuland/digitizing/DigitizingTamex.cxx | 28 +- neuland/digitizing/DigitizingTamex.h | 2 +- neuland/digitizing/R3BNeulandDigitizer.cxx | 10 +- neuland/digitizing/R3BNeulandDigitizer.h | 2 +- neuland/digitizing/R3BNeulandHitMon.cxx | 22 +- neuland/geobase/helper_neuland_geometry.C | 161 +-- .../online/R3BNeulandOnlineReconstruction.cxx | 8 +- neuland/preexp/R3BNeulandCheckMapping.h | 2 +- neuland/preexp/R3BNeulandGainMatching.cxx | 2 +- neuland/preexp/R3BNeulandGainMatching.h | 2 +- neuland/preexp/R3BNeulandTimeRes.cxx | 2 +- .../R3BNeulandNeutronReconstructionMon.cxx | 11 +- ...NeulandNeutronReconstructionStatistics.cxx | 11 +- .../R3BNeulandMultiplicityCalorimetric.cxx | 11 +- ...3BNeulandMultiplicityCalorimetricTrain.cxx | 5 +- .../neutrons/R3BNeulandNeutronsRValue.cxx | 18 +- neuland/test/calibration/testNeulandTracker.C | 2 +- neuland/test/testClusteringEngine.cxx | 4 +- pdc/mapping_pdc_trig.hh | 1029 +++++++++-------- psp/R3BPspxCal2Hit.cxx | 3 +- psp/R3BPspxMapped2Precal.cxx | 3 +- psp/R3BPspxOnlineSpectra.cxx | 6 +- psp/R3BPspxPrecal2Cal.cxx | 3 +- .../testR3BPhaseSpaceGeneratorIntegration.C | 4 +- r3bsource/beammonitor/R3BBeamMonitorReader.h | 2 +- rpc/calibration/R3BRpcCal2Hit.cxx | 2 +- sfib/R3BSfibCal2Hit.h | 2 +- sfib/R3BSfibMapped2Cal.h | 2 +- sfib/sim/R3Bsfi.cxx | 2 +- tof/R3BTofContFact.cxx | 8 +- tof/R3BTofdCal2HistoPar.cxx | 30 +- tof/R3BTofdCal2HitS454.cxx | 2 +- tof/R3BTofdCal2HitS494.cxx | 2 +- tof/R3BTofdDigitizerCal.cxx | 9 +- tof/calibration/R3BPtofCal2Hit.h | 2 +- tof/calibration/R3BPtofParFact.cxx | 2 +- tof/mapping_tofd_trig.hh | 771 ++++++------ tofd/calibration/R3BTofDCal2Hit.cxx | 2 +- tofd/digi/R3BTofDDigitizerCal.cxx | 9 +- tofd/online/R3BTofDOnlineSpectra.cxx | 2 +- tofd/pars/R3BTofDCal2HitPar.cxx | 2 +- tofd/pars/R3BTofDHitModulePar.cxx | 4 +- tofi/mapping_tofi_trig.hh | 195 ++-- tofi/pars/R3BTofiHisto2HitPar.cxx | 30 +- tracker_rene/tracker_routines.h | 66 +- twim/online/R3BTwimOnlineSpectra.h | 9 +- xball/R3BXBall.cxx | 6 +- xball/R3BXBallContFact.cxx | 6 +- xball/xb_crystal_loc.hh | 324 +++--- xball/xb_crystal_mod.hh | 14 +- xball/xb_crystal_part.hh | 23 +- xball/xb_wrapping_loc.hh | 324 +++--- xball/xb_wrapping_mod.hh | 14 +- xball/xb_wrapping_part.hh | 23 +- 102 files changed, 2171 insertions(+), 2056 deletions(-) diff --git a/actar/FastSimulation.cxx b/actar/FastSimulation.cxx index aa037e049..57b5ca21b 100644 --- a/actar/FastSimulation.cxx +++ b/actar/FastSimulation.cxx @@ -31,7 +31,7 @@ #include "FastSimulation.h" #include "GarfieldG4FastSimulationModel.h" #include "GarfieldMessenger.h" -//#include "GarfieldPhysics.h" +// #include "GarfieldPhysics.h" #include diff --git a/atima/R3BAtima.cxx b/atima/R3BAtima.cxx index 03800e7ac..2f7a642da 100644 --- a/atima/R3BAtima.cxx +++ b/atima/R3BAtima.cxx @@ -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 tarFortran; diff --git a/atima/R3BAtima.h b/atima/R3BAtima.h index 7deda9f24..2de676c57 100644 --- a/atima/R3BAtima.h +++ b/atima/R3BAtima.h @@ -100,7 +100,7 @@ namespace R3BAtima Double_t projEnergy_per_u, const TargetMaterial& targetMaterial, Double_t tarThickness_mm); - + }; // namespace R3BAtima #endif diff --git a/califa/test/testCalifaSimulation.C b/califa/test/testCalifaSimulation.C index 3dad750d0..473d71433 100644 --- a/califa/test/testCalifaSimulation.C +++ b/califa/test/testCalifaSimulation.C @@ -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); diff --git a/dch/R3BDch2pDigitizer.cxx b/dch/R3BDch2pDigitizer.cxx index b4f243c75..568df0517 100644 --- a/dch/R3BDch2pDigitizer.cxx +++ b/dch/R3BDch2pDigitizer.cxx @@ -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, > @@ -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 diff --git a/dch/R3BDchContFact.cxx b/dch/R3BDchContFact.cxx index e10be015e..9a5a5903e 100644 --- a/dch/R3BDchContFact.cxx +++ b/dch/R3BDchContFact.cxx @@ -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" diff --git a/dch/R3BDchDigiPar.cxx b/dch/R3BDchDigiPar.cxx index a7733375e..6374e6128 100644 --- a/dch/R3BDchDigiPar.cxx +++ b/dch/R3BDchDigiPar.cxx @@ -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) diff --git a/dch/R3BDchDigitizer.cxx b/dch/R3BDchDigitizer.cxx index 38eac764a..a7e811103 100644 --- a/dch/R3BDchDigitizer.cxx +++ b/dch/R3BDchDigitizer.cxx @@ -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, > @@ -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 diff --git a/epics/R3BChannelAccessEPICS.h b/epics/R3BChannelAccessEPICS.h index ec8e04060..2f274983b 100644 --- a/epics/R3BChannelAccessEPICS.h +++ b/epics/R3BChannelAccessEPICS.h @@ -31,8 +31,8 @@ #ifndef __R3BROOT__R3BCHANNELACCESSEPICS__ #define __R3BROOT__R3BCHANNELACCESSEPICS__ -#include #include "R3BChannelAccess.h" +#include #include class R3BChannelAccessEPICS : public R3BChannelAccess diff --git a/fiber/bunched/R3BBunchedFiberCal2Hit.cxx b/fiber/bunched/R3BBunchedFiberCal2Hit.cxx index bca9cc8b5..2eced3116 100644 --- a/fiber/bunched/R3BBunchedFiberCal2Hit.cxx +++ b/fiber/bunched/R3BBunchedFiberCal2Hit.cxx @@ -15,11 +15,11 @@ #include "R3BBunchedFiberCalData.h" #include "R3BBunchedFiberHitData.h" #include "R3BBunchedFiberHitPar.h" +#include "R3BCoarseTimeStitch.h" #include "R3BEventHeader.h" #include "R3BFiberMappingPar.h" #include "R3BLogger.h" #include "R3BTCalEngine.h" -#include "R3BCoarseTimeStitch.h" #include "TH1F.h" #include "TH2F.h" @@ -202,13 +202,13 @@ InitStatus R3BBunchedFiberCal2Hit::Init() { if (!fIsGain && fIsTsync) // gain already made, tsync will be done now { - R3BBunchedFiberHitModulePar* par = fHitPar->GetModuleParAt(i); + R3BBunchedFiberHitModulePar* par = fHitPar->GetModuleParAt(i); if (par && par->GetGainMA() > 0.) gain_temp[i - 1] = par->GetGainMA(); } if (fIsGain && !fIsTsync) // tsync already made, gain will be done now { - R3BBunchedFiberHitModulePar* par = fHitPar->GetModuleParAt(i); + R3BBunchedFiberHitModulePar* par = fHitPar->GetModuleParAt(i); if (par) tsync_temp[i - 1] = par->GetSync(); } @@ -243,7 +243,14 @@ InitStatus R3BBunchedFiberCal2Hit::Init() // ToT single PMT: chistName = fName + "_ToT_SAPMT"; chistTitle = fName + " ToT of fibers"; - fh_ToT_Single_Fib = new TH2F(chistName.Data(), chistTitle.Data(), fNumFibers, 1, fNumFibers + 1, 500, 0., 100.);//binning changed from 100 to 500 + fh_ToT_Single_Fib = new TH2F(chistName.Data(), + chistTitle.Data(), + fNumFibers, + 1, + fNumFibers + 1, + 500, + 0., + 100.); // binning changed from 100 to 500 fh_ToT_Single_Fib->GetXaxis()->SetTitle("Fiber number"); fh_ToT_Single_Fib->GetYaxis()->SetTitle("ToT / ns"); @@ -369,11 +376,11 @@ void R3BBunchedFiberCal2Hit::S515() for (size_t j = 0; j < cal_num; ++j) { auto cur_cal = dynamic_cast(fCalItems->At(j)); - //auto cur_cal = (R3BBunchedFiberCalData const*)fCalItems->At(j); + // auto cur_cal = (R3BBunchedFiberCalData const*)fCalItems->At(j); if (cur_cal->IsLeading()) - { + { ++n_lead; - //auto side_i = 0; + // auto side_i = 0; auto side_i = cur_cal->IsMAPMT() ? 0 : 1; auto ch_i = cur_cal->GetChannel() - 1; auto& channel = fChannelArray[side_i].at(ch_i); @@ -391,121 +398,122 @@ void R3BBunchedFiberCal2Hit::S515() } for (size_t j = 0; j < cal_num; ++j) - { + { auto cur_cal = dynamic_cast(fCalItems->At(j)); - //auto cur_cal = (R3BBunchedFiberCalData const*)fCalItems->At(j); - if (!cur_cal->IsTrailing() || !cur_cal->IsMAPMT()) continue; - //auto side_i = 0; - auto side_i = cur_cal->IsMAPMT() ? 0 : 1; - auto ch_i = cur_cal->GetChannel() - 1; - auto& channel = fChannelArray[side_i].at(ch_i); - if (channel.lead_list.empty()) - { - continue; - } - auto lead = channel.lead_list.front(); + // auto cur_cal = (R3BBunchedFiberCalData const*)fCalItems->At(j); + if (!cur_cal->IsTrailing() || !cur_cal->IsMAPMT()) + continue; + // auto side_i = 0; + auto side_i = cur_cal->IsMAPMT() ? 0 : 1; + auto ch_i = cur_cal->GetChannel() - 1; + auto& channel = fChannelArray[side_i].at(ch_i); + if (channel.lead_list.empty()) + { + continue; + } + auto lead = channel.lead_list.front(); - Double_t cur_cal_trig_ns = 0; - Double_t lead_trig_ns = 0; - if (cur_cal->IsMAPMT() && fMapPar) - { - auto cur_cal_trig_i = fMapPar->GetTrigMap(side_i + 1, ch_i + 1); // fMAPMTTriggerMap[ch_i]; - auto lead_trig_i = fMapPar->GetTrigMap(side_i + 1, lead->GetChannel()); - // if(fName=="Fi3a") printf("3a trig curr %8u %8u lead %8u %8u %8u\n", ch_i, cur_cal_trig_i, - // lead->GetChannel() - 1, lead_trig_i, mapmt_trig_table.size()); if(fName=="Fi3b") printf("3b trig curr - // %8u %8u lead %8u %8u\n", ch_i, cur_cal_trig_i, lead->GetChannel() - 1, lead_trig_i); - if (cur_cal_trig_i < mapmt_trig_table.size() && lead_trig_i < mapmt_trig_table.size()) - { - auto cur_cal_trig = mapmt_trig_table.at(cur_cal_trig_i); - auto lead_trig = mapmt_trig_table.at(lead_trig_i); - cur_cal_trig_ns = cur_cal_trig->GetTime_ns(); - lead_trig_ns = lead_trig->GetTime_ns(); - } - } + Double_t cur_cal_trig_ns = 0; + Double_t lead_trig_ns = 0; + if (cur_cal->IsMAPMT() && fMapPar) + { + auto cur_cal_trig_i = fMapPar->GetTrigMap(side_i + 1, ch_i + 1); // fMAPMTTriggerMap[ch_i]; + auto lead_trig_i = fMapPar->GetTrigMap(side_i + 1, lead->GetChannel()); + // if(fName=="Fi3a") printf("3a trig curr %8u %8u lead %8u %8u %8u\n", ch_i, cur_cal_trig_i, + // lead->GetChannel() - 1, lead_trig_i, mapmt_trig_table.size()); if(fName=="Fi3b") printf("3b trig curr + // %8u %8u lead %8u %8u\n", ch_i, cur_cal_trig_i, lead->GetChannel() - 1, lead_trig_i); + if (cur_cal_trig_i < mapmt_trig_table.size() && lead_trig_i < mapmt_trig_table.size()) + { + auto cur_cal_trig = mapmt_trig_table.at(cur_cal_trig_i); + auto lead_trig = mapmt_trig_table.at(lead_trig_i); + cur_cal_trig_ns = cur_cal_trig->GetTime_ns(); + lead_trig_ns = lead_trig->GetTime_ns(); + } + } - Double_t cur_cal_ns = 0.; - Double_t lead_ns = 0.; - Double_t tot_ns = 0.; - if (side_i == 0) - { - cur_cal_ns = fTimeStitch->GetTime(cur_cal->GetTime_ns() - cur_cal_trig_ns, "clocktdc", "clocktdc"); - lead_ns = fTimeStitch->GetTime(lead->GetTime_ns() - lead_trig_ns, "clocktdc", "clocktdc"); - tot_ns = fTimeStitch->GetTime(cur_cal_ns - lead_ns, "clocktdc", "clocktdc"); - } - else - { - cur_cal_ns = fTimeStitch->GetTime(cur_cal->GetTime_ns() - cur_cal_trig_ns, "tamex", "tamex"); - lead_ns = fTimeStitch->GetTime(lead->GetTime_ns() - lead_trig_ns, "tamex", "tamex"); - tot_ns = fTimeStitch->GetTime(cur_cal_ns - lead_ns, "tamex", "tamex"); - } + Double_t cur_cal_ns = 0.; + Double_t lead_ns = 0.; + Double_t tot_ns = 0.; + if (side_i == 0) + { + cur_cal_ns = fTimeStitch->GetTime(cur_cal->GetTime_ns() - cur_cal_trig_ns, "clocktdc", "clocktdc"); + lead_ns = fTimeStitch->GetTime(lead->GetTime_ns() - lead_trig_ns, "clocktdc", "clocktdc"); + tot_ns = fTimeStitch->GetTime(cur_cal_ns - lead_ns, "clocktdc", "clocktdc"); + } + else + { + cur_cal_ns = fTimeStitch->GetTime(cur_cal->GetTime_ns() - cur_cal_trig_ns, "tamex", "tamex"); + lead_ns = fTimeStitch->GetTime(lead->GetTime_ns() - lead_trig_ns, "tamex", "tamex"); + tot_ns = fTimeStitch->GetTime(cur_cal_ns - lead_ns, "tamex", "tamex"); + } - auto fiber_id = (lead->GetChannel() - 1) * fChPerSub[1] + 1; + auto fiber_id = (lead->GetChannel() - 1) * fChPerSub[1] + 1; - // Apply calibration. - Double_t gainMA = gain_temp[fiber_id - 1]; // 10.; - Double_t gainS = gain_temp[fiber_id - 1]; - Double_t offset1 = 0.; - Double_t offset2 = 0.; - Double_t tsync = tsync_temp[fiber_id - 1]; // 0.; + // Apply calibration. + Double_t gainMA = gain_temp[fiber_id - 1]; // 10.; + Double_t gainS = gain_temp[fiber_id - 1]; + Double_t offset1 = 0.; + Double_t offset2 = 0.; + Double_t tsync = tsync_temp[fiber_id - 1]; // 0.; - double tof = 0.; + double tof = 0.; - if (!fIsCalibrator && fHitPar) - { - R3BBunchedFiberHitModulePar* par = fHitPar->GetModuleParAt(fiber_id); - if (par) - { - gainMA = par->GetGainMA(); - tsync = par->GetSync(); - gainS = par->GetGainS(); - offset1 = par->GetOffset1(); - offset2 = par->GetOffset2(); - } - } + if (!fIsCalibrator && fHitPar) + { + R3BBunchedFiberHitModulePar* par = fHitPar->GetModuleParAt(fiber_id); + if (par) + { + gainMA = par->GetGainMA(); + tsync = par->GetSync(); + gainS = par->GetGainS(); + offset1 = par->GetOffset1(); + offset2 = par->GetOffset2(); + } + } - fh_time_Fib->Fill(fiber_id, lead_ns); + fh_time_Fib->Fill(fiber_id, lead_ns); - tof = lead_ns - tsync; - auto caltot_ns = tot_ns * 10. / gainMA; + tof = lead_ns - tsync; + auto caltot_ns = tot_ns * 10. / gainMA; - // if (fIsCalibrator) - { - // histogram for offset determination + // if (fIsCalibrator) + { + // histogram for offset determination - // Fill histograms for gain match, and for debugging. - fh_Fib_ToF->Fill(fiber_id, tof); - if (caltot_ns > 0.) + // Fill histograms for gain match, and for debugging. + fh_Fib_ToF->Fill(fiber_id, tof); + if (caltot_ns > 0.) fh_ToT_MA_Fib->Fill(fiber_id, caltot_ns); - } + } - Double_t x = -10000.; - Double_t y = -10000.; - Double_t veff = 12. / 2.; // cm/ns + Double_t x = -10000.; + Double_t y = -10000.; + Double_t veff = 12. / 2.; // cm/ns - if (fName == "Fi10" || fName == "Fi11" || fName == "Fi12" || fName == "Fi13") - { - Float_t fiber_thickness = 0.050000; - Int_t fiber_nbr = 1024; - Float_t dead_layer = 0.9; - Float_t air_layer = 0.0; // relative to fiber_thickness - Float_t detector_width = fiber_nbr * fiber_thickness * (1 + air_layer); + if (fName == "Fi10" || fName == "Fi11" || fName == "Fi12" || fName == "Fi13") + { + Float_t fiber_thickness = 0.050000; + Int_t fiber_nbr = 1024; + Float_t dead_layer = 0.9; + Float_t air_layer = 0.0; // relative to fiber_thickness + Float_t detector_width = fiber_nbr * fiber_thickness * (1 + air_layer); - if (fDirection == VERTICAL) - { - x = (fOrientation == STANDARD ? 1.0 : -1.0) * - (-1.0 * detector_width / 2.0 + (fiber_id - 1.0) * (1.0 + air_layer) * fiber_thickness); - y = 0; - } - else - { - x = 0.; - y = (fOrientation == STANDARD ? 1.0 : -1.0) * - (-1.0 * detector_width / 2.0 + (fiber_id - 1.0) * (1.0 + air_layer) * fiber_thickness); - } - } + if (fDirection == VERTICAL) + { + x = (fOrientation == STANDARD ? 1.0 : -1.0) * + (-1.0 * detector_width / 2.0 + (fiber_id - 1.0) * (1.0 + air_layer) * fiber_thickness); + y = 0; + } + else + { + x = 0.; + y = (fOrientation == STANDARD ? 1.0 : -1.0) * + (-1.0 * detector_width / 2.0 + (fiber_id - 1.0) * (1.0 + air_layer) * fiber_thickness); + } + } - new ((*fHitItems)[fHitItems->GetEntriesFast()]) - R3BBunchedFiberHitData(fDetId, x, y, caltot_ns, tof, fiber_id, lead_ns, 0., caltot_ns, 0.); + new ((*fHitItems)[fHitItems->GetEntriesFast()]) + R3BBunchedFiberHitData(fDetId, x, y, caltot_ns, tof, fiber_id, lead_ns, 0., caltot_ns, 0.); } } @@ -570,7 +578,7 @@ void R3BBunchedFiberCal2Hit::Standard() for (size_t j = 0; j < cal_num; ++j) { auto cur_cal = dynamic_cast(fCalItems->At(j)); - //auto cur_cal = (R3BBunchedFiberCalData const*)fCalItems->At(j); + // auto cur_cal = (R3BBunchedFiberCalData const*)fCalItems->At(j); if (cur_cal->IsLeading()) { ++n_lead; @@ -597,7 +605,7 @@ void R3BBunchedFiberCal2Hit::Standard() for (size_t j = 0; j < cal_num; ++j) { auto cur_cal = dynamic_cast(fCalItems->At(j)); - //auto cur_cal = (R3BBunchedFiberCalData const*)fCalItems->At(j); + // auto cur_cal = (R3BBunchedFiberCalData const*)fCalItems->At(j); if (cur_cal->IsTrailing()) { auto side_i = cur_cal->IsMAPMT() ? 0 : 1; @@ -1001,42 +1009,40 @@ void R3BBunchedFiberCal2Hit::FinishTask() } // SPMT - /* for (UInt_t i = 1; i <= max; i++) - { - TH1D* proj = fh_ToT_Single_Fib->ProjectionY("", i, i, 0); - for (UInt_t j = proj->GetNbinsX(); j > 0; j--) - { - if (j == 2) - { - // could not find maximum - } - - if (proj->GetBinContent(j) > proj->GetMaximum() / 10.) - { - R3BBunchedFiberHitModulePar* par = fCalPar->GetModuleParAt(i); - par->SetGainS(proj->GetBinCenter(j)); - // cout<<"S fiber: "<< i<<" par: "<GetBinCenter(j)<SetGainS(j - 1); - cout << "SPMT fiber: " << i << " par: " << proj->GetBinCenter(j) << endl; - break; - } - } - }*/ + /* for (UInt_t i = 1; i <= max; i++) + { + TH1D* proj = fh_ToT_Single_Fib->ProjectionY("", i, i, 0); + for (UInt_t j = proj->GetNbinsX(); j > 0; j--) + { + if (j == 2) + { + // could not find maximum + } - //Spmt-test - for(UInt_t i = 1;i<=max; i++) - { - TH1D* proj = fh_ToT_Single_Fib->ProjectionY("",i,i, 0); - Int_t binmax = proj->GetMaximumBin(); - auto s_tot = proj->GetXaxis()->GetBinCenter(binmax); + if (proj->GetBinContent(j) > proj->GetMaximum() / 10.) + { + R3BBunchedFiberHitModulePar* par = fCalPar->GetModuleParAt(i); + par->SetGainS(proj->GetBinCenter(j)); + // cout<<"S fiber: "<< i<<" par: "<GetBinCenter(j)<SetGainS(j - 1); + cout << "SPMT fiber: " << i << " par: " << proj->GetBinCenter(j) << endl; + break; + } + } + }*/ - R3BBunchedFiberHitModulePar* par = fCalPar->GetModuleParAt(i); - par->SetGainS(s_tot); + // Spmt-test + for (UInt_t i = 1; i <= max; i++) + { + TH1D* proj = fh_ToT_Single_Fib->ProjectionY("", i, i, 0); + Int_t binmax = proj->GetMaximumBin(); + auto s_tot = proj->GetXaxis()->GetBinCenter(binmax); - cout << "SPMT fiber: " << i << " par: " << s_tot << endl; + R3BBunchedFiberHitModulePar* par = fCalPar->GetModuleParAt(i); + par->SetGainS(s_tot); - - } + cout << "SPMT fiber: " << i << " par: " << s_tot << endl; + } } fCalPar->setChanged(); diff --git a/fiber/bunched/R3BBunchedFiberCal2Hit.h b/fiber/bunched/R3BBunchedFiberCal2Hit.h index 8f5ecdc78..1cb8a634e 100644 --- a/fiber/bunched/R3BBunchedFiberCal2Hit.h +++ b/fiber/bunched/R3BBunchedFiberCal2Hit.h @@ -14,8 +14,8 @@ #ifndef R3BBUNCHEDFIBERCAL2HIT_H #define R3BBUNCHEDFIBERCAL2HIT_H 1 -#include #include "FairTask.h" +#include #include diff --git a/fiber/bunched/R3BBunchedFiberCal2Hit_s494.h b/fiber/bunched/R3BBunchedFiberCal2Hit_s494.h index 9afdf13db..59f47a01b 100644 --- a/fiber/bunched/R3BBunchedFiberCal2Hit_s494.h +++ b/fiber/bunched/R3BBunchedFiberCal2Hit_s494.h @@ -14,8 +14,8 @@ #ifndef R3BBUNCHEDFIBERCAL2HIT_S494 #define R3BBUNCHEDFIBERCAL2HIT_S494 -#include #include "FairTask.h" +#include #include diff --git a/fiber/bunched/R3BBunchedFiberSPMTTrigMapped2Cal.h b/fiber/bunched/R3BBunchedFiberSPMTTrigMapped2Cal.h index 17c7d059e..6a1590a1e 100644 --- a/fiber/bunched/R3BBunchedFiberSPMTTrigMapped2Cal.h +++ b/fiber/bunched/R3BBunchedFiberSPMTTrigMapped2Cal.h @@ -20,9 +20,9 @@ #ifndef R3BBUNCHEDFIBERSPMTTRIGMAPPED2CAL_H #define R3BBUNCHEDFIBERSPMTTRIGMAPPED2CAL_H 1 -#include #include "FairTask.h" #include +#include class R3BTCalPar; diff --git a/fiber/mapmt/R3BFiberMAPMTCal2Hit.cxx b/fiber/mapmt/R3BFiberMAPMTCal2Hit.cxx index abb03070d..25bef8ceb 100644 --- a/fiber/mapmt/R3BFiberMAPMTCal2Hit.cxx +++ b/fiber/mapmt/R3BFiberMAPMTCal2Hit.cxx @@ -12,6 +12,7 @@ ******************************************************************************/ #include "R3BFiberMAPMTCal2Hit.h" +#include "R3BCoarseTimeStitch.h" #include "R3BEventHeader.h" #include "R3BFiberMAPMTCalData.h" #include "R3BFiberMAPMTHitData.h" @@ -19,7 +20,6 @@ #include "R3BFiberMappingPar.h" #include "R3BLogger.h" #include "R3BTCalEngine.h" -#include "R3BCoarseTimeStitch.h" #include "TF1.h" #include "TH1F.h" diff --git a/fiber/mapmt/R3BFiberMAPMTCal2Hit.h b/fiber/mapmt/R3BFiberMAPMTCal2Hit.h index 16bb714ae..e5849c80b 100644 --- a/fiber/mapmt/R3BFiberMAPMTCal2Hit.h +++ b/fiber/mapmt/R3BFiberMAPMTCal2Hit.h @@ -14,8 +14,8 @@ #ifndef R3BFIBERMAPMTCAL2HIT_H #define R3BFIBERMAPMTCAL2HIT_H 1 -#include #include "FairTask.h" +#include #include class TH1F; diff --git a/fiber/mapmt/R3BFiberMAPMTMapped2Cal.h b/fiber/mapmt/R3BFiberMAPMTMapped2Cal.h index 5743e8ed0..6ad8ea026 100644 --- a/fiber/mapmt/R3BFiberMAPMTMapped2Cal.h +++ b/fiber/mapmt/R3BFiberMAPMTMapped2Cal.h @@ -20,9 +20,9 @@ #ifndef R3BFIBERMAPMTMAPPED2CAL_H #define R3BFIBERMAPMTMAPPED2CAL_H 1 -#include #include "FairTask.h" #include +#include class R3BTCalPar; diff --git a/fiber/pars/R3BFiberMAPMTHitModulePar.cxx b/fiber/pars/R3BFiberMAPMTHitModulePar.cxx index 4bd2f5b13..b973c935a 100644 --- a/fiber/pars/R3BFiberMAPMTHitModulePar.cxx +++ b/fiber/pars/R3BFiberMAPMTHitModulePar.cxx @@ -16,9 +16,9 @@ #include "FairLogger.h" #include "FairParamList.h" -//#include "TF1.h" -//#include "TH1F.h" -//#include "TPad.h" +// #include "TF1.h" +// #include "TH1F.h" +// #include "TPad.h" R3BFiberMAPMTHitModulePar::R3BFiberMAPMTHitModulePar(const char* name, const char* title, diff --git a/gconfig/g4GarfieldConfig.C b/gconfig/g4GarfieldConfig.C index f2dffe404..2f121540c 100644 --- a/gconfig/g4GarfieldConfig.C +++ b/gconfig/g4GarfieldConfig.C @@ -28,58 +28,54 @@ void Config() { -/// The configuration function for Geant4 VMC for Garfield example -/// called during MC application initialization. -/// For geometry defined with Root and Geant4 native navigation + /// The configuration function for Geant4 VMC for Garfield example + /// called during MC application initialization. + /// For geometry defined with Root and Geant4 native navigation - // cout << "Constructing Garfield::RunConfiguration " << endl; + // cout << "Constructing Garfield::RunConfiguration " << endl; - // Run configuration - VMC::Garfield::RunConfiguration* runConfiguration - = new VMC::Garfield::RunConfiguration("geomRoot", "FTFP_BERT"); - - cout << "Constructing TG4RunConfiguration " << endl; + // Run configuration + VMC::Garfield::RunConfiguration* runConfiguration = new VMC::Garfield::RunConfiguration("geomRoot", "FTFP_BERT"); - // Run configuration with special cuts activated - // VMC::Garfield::RunConfiguration* runConfiguration - // = new VMC::Garfield::RunConfiguration("geomRootToGeant4", "FTFP_BERT", "specialCuts"); + cout << "Constructing TG4RunConfiguration " << endl; - // TGeant4 - TGeant4* geant4 - = new TGeant4("TGeant4", "The Geant4 Monte Carlo", runConfiguration); + // Run configuration with special cuts activated + // VMC::Garfield::RunConfiguration* runConfiguration + // = new VMC::Garfield::RunConfiguration("geomRootToGeant4", "FTFP_BERT", "specialCuts"); - cout << "Geant4 has been created." << endl; - - // Customise Geant4 setting - // Fast simulation model configuration - // + verbose level, global range cuts, etc. - //geant4->ProcessGeantMacro("g4garfieldconfig.in"); + // TGeant4 + TGeant4* geant4 = new TGeant4("TGeant4", "The Geant4 Monte Carlo", runConfiguration); + cout << "Geant4 has been created." << endl; -/// create the Specific stack - R3BStack *stack = new R3BStack(1000); - stack->SetDebug(kFALSE); - stack->StoreSecondaries(kTRUE); - stack->SetMinPoints(0); - geant4->SetStack(stack); + // Customise Geant4 setting + // Fast simulation model configuration + // + verbose level, global range cuts, etc. + // geant4->ProcessGeantMacro("g4garfieldconfig.in"); - if(FairRunSim::Instance()->IsExtDecayer()){ - TVirtualMCDecayer* decayer = TPythia6Decayer::Instance(); - geant4->SetExternalDecayer(decayer); - } + /// create the Specific stack + R3BStack* stack = new R3BStack(1000); + stack->SetDebug(kFALSE); + stack->StoreSecondaries(kTRUE); + stack->SetMinPoints(0); + geant4->SetStack(stack); -/// Customise Geant4 setting -/// (verbose level, global range cut, ..) + if (FairRunSim::Instance()->IsExtDecayer()) + { + TVirtualMCDecayer* decayer = TPythia6Decayer::Instance(); + geant4->SetExternalDecayer(decayer); + } - TString configm(gSystem->Getenv("VMCWORKDIR")); - configm1 = configm + "/gconfig/g4garfieldconfig.in"; - cout << " -I g4GarfieldConfig() using g4garfieldconf macro: " << configm1 << endl; + /// Customise Geant4 setting + /// (verbose level, global range cut, ..) - //set geant4 specific stuff - geant4->SetMaxNStep(10000); // default is 30000 - geant4->ProcessGeantMacro(configm1.Data()); + TString configm(gSystem->Getenv("VMCWORKDIR")); + configm1 = configm + "/gconfig/g4garfieldconfig.in"; + cout << " -I g4GarfieldConfig() using g4garfieldconf macro: " << configm1 << endl; + // set geant4 specific stuff + geant4->SetMaxNStep(10000); // default is 30000 + geant4->ProcessGeantMacro(configm1.Data()); - cout << "Processing Config() done." << endl; + cout << "Processing Config() done." << endl; } - diff --git a/gfi/R3BGfiContFact.cxx b/gfi/R3BGfiContFact.cxx index 888738502..e23bced84 100644 --- a/gfi/R3BGfiContFact.cxx +++ b/gfi/R3BGfiContFact.cxx @@ -24,13 +24,13 @@ #include "R3BGfiContFact.h" -//#include "R3BGfiParRootFileIo.h" -//#include "R3BGfiParAsciiFileIo.h" +// #include "R3BGfiParRootFileIo.h" +// #include "R3BGfiParAsciiFileIo.h" #include "R3BGeoGfiPar.h" -//#include "R3BGfiDigiPar.h" +// #include "R3BGfiDigiPar.h" #include "FairRuntimeDb.h" -//#include "CbmParTest.h" +// #include "CbmParTest.h" #include "FairParAsciiFileIo.h" #include "FairParRootFileIo.h" diff --git a/input/p2p/ana_file.C b/input/p2p/ana_file.C index ff729b5fb..ac16c2ddb 100644 --- a/input/p2p/ana_file.C +++ b/input/p2p/ana_file.C @@ -1,9 +1,10 @@ -void ana_file(){ +void ana_file() +{ - std::ifstream fFile; //! Input file handle - - const std::string fFileName="quasi_ascii.txt"; //! Input file name + std::ifstream fFile; //! Input file handle + + const std::string fFileName = "quasi_ascii.txt"; //! Input file name // Event variable to be read from file int eventId = -1; @@ -21,52 +22,44 @@ void ana_file(){ double ivx = 0.; double ivy = 0.; double ivz = 0.; - + auto fheang_1 = new TH2F("fheang_1", "", 200, 0, 90, 2000, 0, 800); - + if (!fFile.is_open()) { fFile.open(fFileName); } - - while(!fFile.eof()){ - // Read event number and number of primary particles. - if (!(fFile >> eventId >> nTracks)) + while (!fFile.eof()) { - - - } - // Ignore the other stuff that might still be on that line - fFile.ignore(std::numeric_limits::max(), '\n'); - - // Loop over tracks in the current event - for (int itrack = 0; itrack < nTracks; itrack++) - { - if (!(fFile >> iPid >> iZ >> iA >> px >> py >> pz >> ivx >> ivy >> ivz)) + // Read event number and number of primary particles. + if (!(fFile >> eventId >> nTracks)) { - } // Ignore the other stuff that might still be on that line fFile.ignore(std::numeric_limits::max(), '\n'); - //std::cout<< pz<Fill(180.*atan(sqrt(px*px+py*py)/pz)/3.1415,1000.*(sqrt(px*px+py*py+pz*pz+0.93827*0.93827)-0.93827)); + // Loop over tracks in the current event + for (int itrack = 0; itrack < nTracks; itrack++) + { + if (!(fFile >> iPid >> iZ >> iA >> px >> py >> pz >> ivx >> ivy >> ivz)) + { + } + // Ignore the other stuff that might still be on that line + fFile.ignore(std::numeric_limits::max(), '\n'); + + // std::cout<< pz<Fill(180. * atan(sqrt(px * px + py * py) / pz) / 3.1415, + 1000. * (sqrt(px * px + py * py + pz * pz + 0.93827 * 0.93827) - 0.93827)); + } //! tracks - } //! tracks - - printf( - "Processed: \033[32m %d \033[0m \033[31m \033[0m \r", - eventId); + printf("Processed: \033[32m %d \033[0m \033[31m \033[0m \r", eventId); fflush(stdout); - } - TCanvas *c4 = new TCanvas("c4"); + TCanvas* c4 = new TCanvas("c4"); fheang_1->Draw("col"); - } diff --git a/input/p2p/info/headers.hh b/input/p2p/info/headers.hh index ee9773831..de7721269 100644 --- a/input/p2p/info/headers.hh +++ b/input/p2p/info/headers.hh @@ -1,28 +1,28 @@ #ifndef __HEADERS_HH__ #define __HEADERS_HH__ -//A structure to store momentum and angles of two -//scattered particles in CM system +// A structure to store momentum and angles of two +// scattered particles in CM system struct cm_values { - //Internal cluster - double e_clust; - double p_clust; - double theta_clust; - //Scattered particle - double e_scat; - double p_scat; - double theta_scat; - //indicates satisfactory kinematics (i.e. energy & momentum conservation) - bool good; - double T; + // Internal cluster + double e_clust; + double p_clust; + double theta_clust; + // Scattered particle + double e_scat; + double p_scat; + double theta_scat; + // indicates satisfactory kinematics (i.e. energy & momentum conservation) + bool good; + double T; }; -TVector3 DREHUNG(TVector3 v1,TVector3 v2); -double CINEMA(double,double,double); -cm_values CENMASS(double,double,double,double,bool); -double momentum_CM(double,double,double); -double get_T(double,double); -std::pair Lorentz(double,double,double,double); -void run(); +TVector3 DREHUNG(TVector3 v1, TVector3 v2); +double CINEMA(double, double, double); +cm_values CENMASS(double, double, double, double, bool); +double momentum_CM(double, double, double); +double get_T(double, double); +std::pair Lorentz(double, double, double, double); +void run(); #endif //__HEADERS_HH__ diff --git a/input/p2p/info/info.hh b/input/p2p/info/info.hh index dd5e1e100..cffbf917d 100644 --- a/input/p2p/info/info.hh +++ b/input/p2p/info/info.hh @@ -3,23 +3,22 @@ #include -const int MAX_STORY = 10000000; // Total number of generated events -const double ENERGY = 500.; // Beam energy (MeV/u) -const double Exe = 0.0; // Residual excitation energy (MeV) (change it for deeply bound states) -const bool ISOTROPIC = true; // Internal momentum spread (Gauss) -//const double UNIT = 931.494061; // Atomic mass unit MeV/cē -const double UNIT = 931.4940954; // Atomic mass unit MeV/cē +const int MAX_STORY = 10000000; // Total number of generated events +const double ENERGY = 500.; // Beam energy (MeV/u) +const double Exe = 0.0; // Residual excitation energy (MeV) (change it for deeply bound states) +const bool ISOTROPIC = true; // Internal momentum spread (Gauss) +// const double UNIT = 931.494061; // Atomic mass unit MeV/cē +const double UNIT = 931.4940954; // Atomic mass unit MeV/cē +// Nuclear masses from http://wwwndc.jaea.go.jp/NuC/ +// warn (M. Winkel): website above lists ATOMIC masses! -//Nuclear masses from http://wwwndc.jaea.go.jp/NuC/ -// warn (M. Winkel): website above lists ATOMIC masses! +// C-12 -//C-12 - -const int A = 12; // Mass number of the nucleus A -const double MA = 12.*UNIT; // Nuclear mass of initital A nucleus(MeV/cē) -const double MB = 11.009305404*UNIT + Exe; // Nuclear mass of the residual fragment B (MeV/cē) -const double MOM_SIGMA = 20.00; // Internal momentum spread (Gauss) +const int A = 12; // Mass number of the nucleus A +const double MA = 12. * UNIT; // Nuclear mass of initital A nucleus(MeV/cē) +const double MB = 11.009305404 * UNIT + Exe; // Nuclear mass of the residual fragment B (MeV/cē) +const double MOM_SIGMA = 20.00; // Internal momentum spread (Gauss) /* //Pb-208 @@ -28,7 +27,7 @@ const double MA = 207.976651189*UNIT; const double MB = 206.977419033*UNIT + Exe; const double MOM_SIGMA = 100.00; */ -//O-18 +// O-18 /* const int A = 18; const double MA = 17.99915961286*UNIT; @@ -53,10 +52,10 @@ const double MB = (A-1)*UNIT + Exe; const double MOM_SIGMA = 30.0; // Per dimension */ -const double Ma = 938.272; // Mass of the knocked-out nucleon (MeV/cē) -const double Mi = 938.272; // Mass of the scattered nucleon (MeV/cē) +const double Ma = 938.272; // Mass of the knocked-out nucleon (MeV/cē) +const double Mi = 938.272; // Mass of the scattered nucleon (MeV/cē) -//Constants +// Constants const double PI = M_PI; #endif diff --git a/input/p2p/info/libs.hh b/input/p2p/info/libs.hh index 1a4df2884..bcef56250 100644 --- a/input/p2p/info/libs.hh +++ b/input/p2p/info/libs.hh @@ -3,17 +3,17 @@ // C++ libs #include -#include #include -#include +#include #include -#include #include -//#include +#include +#include +// #include #include -#include #include //added -//#include +#include +// #include // ROOT libs #include "Riostream.h" // added @@ -23,29 +23,29 @@ #include #include #include +#include #include #include -#include #include +#include #include #include #include #include -#include -#include -#include -#include #include -#include +#include +#include +#include #include -#include #include -#include +#include #include #include #include +#include +#include +#include #include -#include -#include +#include #endif //__LIBS_HH__ diff --git a/input/p2p/info/tree.hh b/input/p2p/info/tree.hh index a90683b42..6d431226c 100644 --- a/input/p2p/info/tree.hh +++ b/input/p2p/info/tree.hh @@ -1,58 +1,58 @@ #ifndef __TREE_HH__ #define __TREE_HH__ -Double_t theta_1, theta_2, theta_B; -Double_t phi_1, phi_2, phi_B; -Double_t P1x, P1y, P1z; -Double_t P2x, P2y, P2z; -Double_t PBx, PBy, PBz_lab, PBz_rf; -Double_t E1, E2, EB; -Double_t th1_cm, th2_cm, phi1_cm, phi2_cm; -Double_t P1_cm, P2_cm; +Double_t theta_1, theta_2, theta_B; +Double_t phi_1, phi_2, phi_B; +Double_t P1x, P1y, P1z; +Double_t P2x, P2y, P2z; +Double_t PBx, PBy, PBz_lab, PBz_rf; +Double_t E1, E2, EB; +Double_t th1_cm, th2_cm, phi1_cm, phi2_cm; +Double_t P1_cm, P2_cm; Double_t Moff, Mandelstam_T, Opang, Dif_phi; Double_t Mandelstam_S; -//Angles in lab [radians] -tree->Branch("theta_1", &theta_1 , "theta_1/D"); -tree->Branch("theta_2", &theta_2 , "theta_2/D"); -tree->Branch("theta_B", &theta_B , "theta_B/D"); +// Angles in lab [radians] +tree->Branch("theta_1", &theta_1, "theta_1/D"); +tree->Branch("theta_2", &theta_2, "theta_2/D"); +tree->Branch("theta_B", &theta_B, "theta_B/D"); -tree->Branch("phi_1", &phi_1 , "phi_1/D"); -tree->Branch("phi_2", &phi_2 , "phi_2/D"); -tree->Branch("phi_B", &phi_B , "phi_B/D"); +tree->Branch("phi_1", &phi_1, "phi_1/D"); +tree->Branch("phi_2", &phi_2, "phi_2/D"); +tree->Branch("phi_B", &phi_B, "phi_B/D"); -//Momenta in lab [MeV/c] -tree->Branch("P1x", &P1x , "P1x/D"); -tree->Branch("P1y", &P1y , "P1y/D"); -tree->Branch("P1z", &P1z , "P1z/D"); +// Momenta in lab [MeV/c] +tree->Branch("P1x", &P1x, "P1x/D"); +tree->Branch("P1y", &P1y, "P1y/D"); +tree->Branch("P1z", &P1z, "P1z/D"); -tree->Branch("P2x", &P2x , "P2x/D"); -tree->Branch("P2y", &P2y , "P2y/D"); -tree->Branch("P2z", &P2z , "P2z/D"); +tree->Branch("P2x", &P2x, "P2x/D"); +tree->Branch("P2y", &P2y, "P2y/D"); +tree->Branch("P2z", &P2z, "P2z/D"); -tree->Branch("PBx", &PBx , "PBx/D"); -tree->Branch("PBy", &PBy , "PBy/D"); -tree->Branch("PBz_lab", &PBz_lab , "PBz_lab/D"); //longitudinal momentum in lab -tree->Branch("PBz_rf" , &PBz_rf , "PBz_rf/D"); //longitudinal momentum in the restframe of A +tree->Branch("PBx", &PBx, "PBx/D"); +tree->Branch("PBy", &PBy, "PBy/D"); +tree->Branch("PBz_lab", &PBz_lab, "PBz_lab/D"); // longitudinal momentum in lab +tree->Branch("PBz_rf", &PBz_rf, "PBz_rf/D"); // longitudinal momentum in the restframe of A -//Energies in lab -tree->Branch("E1", &E1 , "E1/D"); -tree->Branch("E2", &E2 , "E2/D"); -tree->Branch("EB", &EB , "EB/D"); +// Energies in lab +tree->Branch("E1", &E1, "E1/D"); +tree->Branch("E2", &E2, "E2/D"); +tree->Branch("EB", &EB, "EB/D"); -//Center-off-mass variables of two nucleons -tree->Branch("th1_cm", &th1_cm , "th1_cm/D"); -tree->Branch("th2_cm", &th2_cm , "th2_cm/D"); +// Center-off-mass variables of two nucleons +tree->Branch("th1_cm", &th1_cm, "th1_cm/D"); +tree->Branch("th2_cm", &th2_cm, "th2_cm/D"); -tree->Branch("P1_cm", &P1_cm , "P1_cm/D"); -tree->Branch("P2_cm", &P2_cm , "P2_cm/D"); +tree->Branch("P1_cm", &P1_cm, "P1_cm/D"); +tree->Branch("P2_cm", &P2_cm, "P2_cm/D"); -tree->Branch("Moff", &Moff , "Moff/D"); //off_shell mass -tree->Branch("Mandelstam_T", &Mandelstam_T , "Mandelstam_T/D");//momentum transfer [(MeV/c)^2] -tree->Branch("Mandelstam_S", &Mandelstam_S , "Mandelstam_S/D");//total energy MeV +tree->Branch("Moff", &Moff, "Moff/D"); // off_shell mass +tree->Branch("Mandelstam_T", &Mandelstam_T, "Mandelstam_T/D"); // momentum transfer [(MeV/c)^2] +tree->Branch("Mandelstam_S", &Mandelstam_S, "Mandelstam_S/D"); // total energy MeV -//Opening angle and dPhi of two outgoing nucleons -tree->Branch("Opang" , &Opang , "Opang/D"); -tree->Branch("Dif_phi", &Dif_phi , "Dif_phi/D"); +// Opening angle and dPhi of two outgoing nucleons +tree->Branch("Opang", &Opang, "Opang/D"); +tree->Branch("Dif_phi", &Dif_phi, "Dif_phi/D"); #endif //__TREE_HH__ diff --git a/input/p2p/libs.hh b/input/p2p/libs.hh index 0e9294fe1..1b9e52337 100644 --- a/input/p2p/libs.hh +++ b/input/p2p/libs.hh @@ -3,16 +3,16 @@ // C++ libs #include -#include #include -#include +#include #include +#include #include -//#include +// #include #include -#include #include //added -//#include +#include +// #include // ROOT libs #include "Riostream.h" // added @@ -29,20 +29,20 @@ #include #include #include -//#include -#include +// #include +#include +#include #include -#include -#include #include -#include -#include -#include -#include #include -#include #include -#include +#include #include +#include +#include +#include +#include +#include +#include #endif //__LIBS_HH__ diff --git a/input/p2p/qfs.C b/input/p2p/qfs.C index 4cef8ade4..9a58a8e7e 100644 --- a/input/p2p/qfs.C +++ b/input/p2p/qfs.C @@ -42,7 +42,7 @@ void run(TString fname) cout << "Total energy:\t\t" << EA << " MeV" << endl; cout << "Excitation energy:\t" << Exe << " MeV" << endl; cout << "Beta (beam):\t\t" << (-bA) << "\nGamma (beam):\t" << gA << endl; - + cout << "Beta (CM):\t\t" << PA / (EA + Mi) << endl; cout << "Processing " << MAX_STORY << " events........\n" << endl; diff --git a/land/R3BLandContFact.cxx b/land/R3BLandContFact.cxx index fccf09624..437dac5bd 100644 --- a/land/R3BLandContFact.cxx +++ b/land/R3BLandContFact.cxx @@ -24,8 +24,8 @@ #include "R3BLandContFact.h" -//#include "R3BLandParRootFileIo.h" -//#include "R3BLandParAsciiFileIo.h" +// #include "R3BLandParRootFileIo.h" +// #include "R3BLandParAsciiFileIo.h" #include "R3BGeoLandPar.h" #include "R3BLandDigiPar.h" diff --git a/los/R3BLosProvideTStart.cxx b/los/R3BLosProvideTStart.cxx index 443f9447e..d44229af7 100644 --- a/los/R3BLosProvideTStart.cxx +++ b/los/R3BLosProvideTStart.cxx @@ -13,9 +13,9 @@ #include "R3BLosProvideTStart.h" #include "FairRootManager.h" +#include "R3BCoarseTimeStitch.h" #include "R3BEventHeader.h" #include "R3BLogger.h" -#include "R3BCoarseTimeStitch.h" R3BLosProvideTStart::R3BLosProvideTStart() : FairTask("R3BLosProvideTStart", 0) @@ -36,10 +36,10 @@ InitStatus R3BLosProvideTStart::Init() fLosCalData.Init(); fLosTriggerCalData.Init(); - if(fUseTrigHit) + if (fUseTrigHit) { - fLosHitData.Init(); - fLosTriggerData.Init(); + fLosHitData.Init(); + fLosTriggerData.Init(); } auto ioman = FairRootManager::Instance(); @@ -60,15 +60,15 @@ InitStatus R3BLosProvideTStart::Init() return kSUCCESS; } -void R3BLosProvideTStart::Exec(Option_t*) -{ - if(fUseTrigHit) +void R3BLosProvideTStart::Exec(Option_t*) +{ + if (fUseTrigHit) { - fEventHeader->SetTStart(GetTStartTrigHit()); - return; + fEventHeader->SetTStart(GetTStartTrigHit()); + return; } - - fEventHeader->SetTStart(GetTStart()); + + fEventHeader->SetTStart(GetTStart()); } Double_t R3BLosProvideTStart::GetTStart() const @@ -79,8 +79,8 @@ Double_t R3BLosProvideTStart::GetTStart() const auto T1 = 10240; // TAMEX, range is 2048*5ns auto T2 = 40960; // VFTX, range is 40960*5ns - const int c1 = std::min(T1,T2); - const int c2 = std::max(T1,T2); + const int c1 = std::min(T1, T2); + const int c2 = std::max(T1, T2); if (losCalData.empty()) { @@ -122,12 +122,13 @@ Double_t R3BLosProvideTStart::GetTStartTrigHit() const } else { - for (auto it = losHitData.rbegin(); it != losHitData.rend(); ++it) - { - Double_t tref_t = fTimeStitch->GetTime((*it)->GetTime() - losTriggerData.front()->GetRawTimeNs(), "vftx", "vftx"); - if(tref_t > edgeL && tref_t < edgeR) - return tref_t; - } + for (auto it = losHitData.rbegin(); it != losHitData.rend(); ++it) + { + Double_t tref_t = + fTimeStitch->GetTime((*it)->GetTime() - losTriggerData.front()->GetRawTimeNs(), "vftx", "vftx"); + if (tref_t > edgeL && tref_t < edgeR) + return tref_t; + } } return std::numeric_limits::quiet_NaN(); } diff --git a/los/R3BLosProvideTStart.h b/los/R3BLosProvideTStart.h index bed4dc8fa..0b0d1e180 100644 --- a/los/R3BLosProvideTStart.h +++ b/los/R3BLosProvideTStart.h @@ -16,8 +16,8 @@ #include "FairTask.h" #include "R3BLosCalData.h" -#include "R3BLosTCalData.h" #include "R3BLosHitData.h" +#include "R3BLosTCalData.h" #include "TCAConnector.h" class R3BEventHeader; @@ -30,8 +30,13 @@ class R3BLosProvideTStart : public FairTask InitStatus Init() override; void Exec(Option_t*) override; - // Setter to fix trigger peak window - void SetWindow(Double_t left, Double_t right){edgeL = left; edgeR = right; fUseTrigHit = kTRUE;} + // Setter to fix trigger peak window + void SetWindow(Double_t left, Double_t right) + { + edgeL = left; + edgeR = right; + fUseTrigHit = kTRUE; + } private: TCAOptionalInputConnector fLosCalData; @@ -48,7 +53,7 @@ class R3BLosProvideTStart : public FairTask Bool_t fUseTrigHit; Double_t edgeL, edgeR; - + ClassDefOverride(R3BLosProvideTStart, 0) }; diff --git a/los/calib/R3BLosCal2Hit.cxx b/los/calib/R3BLosCal2Hit.cxx index 66c725f36..f871d3c70 100644 --- a/los/calib/R3BLosCal2Hit.cxx +++ b/los/calib/R3BLosCal2Hit.cxx @@ -536,12 +536,16 @@ void R3BLosCal2Hit::Exec(Option_t* option) // Sorting VFTX data: - std::qsort(time_V, nHits, sizeof(*time_V), [](const void* arg1, const void* arg2) -> int { - double const* lhs = static_cast(arg1); - double const* rhs = static_cast(arg2); - - return (lhs[0] < rhs[0]) ? -1 : ((rhs[0] < lhs[0]) ? 1 : 0); - }); + std::qsort(time_V, + nHits, + sizeof(*time_V), + [](const void* arg1, const void* arg2) -> int + { + double const* lhs = static_cast(arg1); + double const* rhs = static_cast(arg2); + + return (lhs[0] < rhs[0]) ? -1 : ((rhs[0] < lhs[0]) ? 1 : 0); + }); // End sorting for (Int_t ihit = 0; ihit < nHits; ihit++) diff --git a/los/calib/R3BLosTCal2Hit.cxx b/los/calib/R3BLosTCal2Hit.cxx index 15d154357..19cd92dca 100644 --- a/los/calib/R3BLosTCal2Hit.cxx +++ b/los/calib/R3BLosTCal2Hit.cxx @@ -18,8 +18,9 @@ #include "R3BLosTCal2Hit.h" #include "FairLogger.h" -#include "FairRuntimeDb.h" #include "FairRootManager.h" +#include "FairRuntimeDb.h" +#include "R3BCoarseTimeStitch.h" #include "R3BEventHeader.h" #include "R3BLosHitData.h" #include "R3BLosHitPar.h" @@ -28,7 +29,6 @@ #include "R3BLosTCalData.h" #include "R3BTCalEngine.h" #include "R3BTCalPar.h" -#include "R3BCoarseTimeStitch.h" #include "TClonesArray.h" #include "TH1F.h" #include "TH2F.h" @@ -213,7 +213,6 @@ InitStatus R3BLosTCal2Hit::Init() } } - SetParameter(); return kSUCCESS; } diff --git a/los/calib/R3BLosTCal2Hit.h b/los/calib/R3BLosTCal2Hit.h index 561640a9d..9ad740cdb 100644 --- a/los/calib/R3BLosTCal2Hit.h +++ b/los/calib/R3BLosTCal2Hit.h @@ -145,11 +145,11 @@ class R3BLosTCal2Hit : public FairTask private: void SetParameter(); - R3BLosHitPar* fLosHit_Par; // Parameter container - TClonesArray* fTCalItems; /**< Array with Cal items - input data. */ - TClonesArray* fTCalTriggerItems; /**< Array with Trigger Cal items - input data. */ - TClonesArray* fHitItems; /**< Array with Hit items - output data. */ - R3BCoarseTimeStitch* fTimeStitch; /**< Array with Hit items - output data. */ + R3BLosHitPar* fLosHit_Par; // Parameter container + TClonesArray* fTCalItems; /**< Array with Cal items - input data. */ + TClonesArray* fTCalTriggerItems; /**< Array with Trigger Cal items - input data. */ + TClonesArray* fHitItems; /**< Array with Hit items - output data. */ + R3BCoarseTimeStitch* fTimeStitch; /**< Array with Hit items - output data. */ Float_t fp0, fp1; TArrayF* fLEMatchParams; TArrayF* fTEMatchParams; diff --git a/los/online/R3BLosOnlineSpectra.cxx b/los/online/R3BLosOnlineSpectra.cxx index 3d75e7614..14b87d236 100644 --- a/los/online/R3BLosOnlineSpectra.cxx +++ b/los/online/R3BLosOnlineSpectra.cxx @@ -18,12 +18,12 @@ // ------------------------------------------------------------ #include "R3BLosOnlineSpectra.h" +#include "R3BCoarseTimeStitch.h" #include "R3BEventHeader.h" #include "R3BLogger.h" #include "R3BLosCalData.h" #include "R3BLosMappedData.h" #include "R3BTCalEngine.h" -#include "R3BCoarseTimeStitch.h" #include "FairLogger.h" #include "FairRootManager.h" @@ -391,7 +391,7 @@ void R3BLosOnlineSpectra::Exec(Option_t* option) Double_t time_L[fNofLosDetectors][32][8]; Double_t time_T[fNofLosDetectors][32][8]; Double_t tot[fNofLosDetectors][32][8]; - Double_t time_MTDC[32][8] = { {0.} }; + Double_t time_MTDC[32][8] = { { 0. } }; Double_t LosTresMTDC[32]; for (Int_t idet = 0; idet < fNofLosDetectors; idet++) @@ -470,8 +470,8 @@ void R3BLosOnlineSpectra::Exec(Option_t* option) nPartLOS = det->GetEntriesFast(); Int_t iDet = 0; - Double_t time_V_LOS1[32][8] = { {0.} }; - Double_t time_V_LOS2[32][8] = { {0.} }; + Double_t time_V_LOS1[32][8] = { { 0. } }; + Double_t time_V_LOS2[32][8] = { { 0. } }; for (Int_t iPart = 0; iPart < nPartLOS; iPart++) { @@ -551,12 +551,16 @@ void R3BLosOnlineSpectra::Exec(Option_t* option) // detector 1 if (nPartc[0] > 0) { - std::qsort(time_V_LOS1, nPartc[0], sizeof(*time_V_LOS1), [](const void* arg1, const void* arg2) -> int { - double const* lhs = static_cast(arg1); - double const* rhs = static_cast(arg2); - - return (lhs[0] < rhs[0]) ? -1 : ((rhs[0] < lhs[0]) ? 1 : 0); - }); + std::qsort(time_V_LOS1, + nPartc[0], + sizeof(*time_V_LOS1), + [](const void* arg1, const void* arg2) -> int + { + double const* lhs = static_cast(arg1); + double const* rhs = static_cast(arg2); + + return (lhs[0] < rhs[0]) ? -1 : ((rhs[0] < lhs[0]) ? 1 : 0); + }); for (Int_t iPart = 0; iPart < nPartc[0]; iPart++) { for (int ipm = 0; ipm < 8; ipm++) @@ -569,12 +573,16 @@ void R3BLosOnlineSpectra::Exec(Option_t* option) // detector 2 if (fNofLosDetectors > 1 && nPartc[1] > 0) { - std::qsort(time_V_LOS2, nPartc[1], sizeof(*time_V_LOS2), [](const void* arg1, const void* arg2) -> int { - double const* lhs = static_cast(arg1); - double const* rhs = static_cast(arg2); - - return (lhs[0] < rhs[0]) ? -1 : ((rhs[0] < lhs[0]) ? 1 : 0); - }); + std::qsort(time_V_LOS2, + nPartc[1], + sizeof(*time_V_LOS2), + [](const void* arg1, const void* arg2) -> int + { + double const* lhs = static_cast(arg1); + double const* rhs = static_cast(arg2); + + return (lhs[0] < rhs[0]) ? -1 : ((rhs[0] < lhs[0]) ? 1 : 0); + }); for (Int_t iPart = 0; iPart < nPartc[1]; iPart++) { for (int ipm = 0; ipm < 8; ipm++) diff --git a/los/params/R3BLosCal2HitPar.cxx b/los/params/R3BLosCal2HitPar.cxx index 9f51bc04e..bf2cc88c6 100644 --- a/los/params/R3BLosCal2HitPar.cxx +++ b/los/params/R3BLosCal2HitPar.cxx @@ -267,12 +267,16 @@ void R3BLosCal2HitPar::Exec(Option_t* option) if (iDet == fidentDet && nPartc > 0) { - std::qsort(time_V, nPartc, sizeof(*time_V), [](const void* arg1, const void* arg2) -> int { - double const* lhs = static_cast(arg1); - double const* rhs = static_cast(arg2); - - return (lhs[0] < rhs[0]) ? -1 : ((rhs[0] < lhs[0]) ? 1 : 0); - }); + std::qsort(time_V, + nPartc, + sizeof(*time_V), + [](const void* arg1, const void* arg2) -> int + { + double const* lhs = static_cast(arg1); + double const* rhs = static_cast(arg2); + + return (lhs[0] < rhs[0]) ? -1 : ((rhs[0] < lhs[0]) ? 1 : 0); + }); } // End sorting diff --git a/los/params/R3BLosHitPar.cxx b/los/params/R3BLosHitPar.cxx index 91919c6cb..29863a4b4 100644 --- a/los/params/R3BLosHitPar.cxx +++ b/los/params/R3BLosHitPar.cxx @@ -14,9 +14,9 @@ #include "R3BLosHitPar.h" #include "FairLogger.h" #include "FairParamList.h" +#include "TArrayF.h" #include "TMath.h" #include "TString.h" -#include "TArrayF.h" #include @@ -31,9 +31,9 @@ R3BLosHitPar::R3BLosHitPar(const TString& name, const TString& title, const TStr } // ---- Destructor ------------------------------------------------------------ -R3BLosHitPar::~R3BLosHitPar() -{ - clear(); +R3BLosHitPar::~R3BLosHitPar() +{ + clear(); if (fLEMatchParams) delete fLEMatchParams; if (fTEMatchParams) @@ -63,12 +63,12 @@ void R3BLosHitPar::putParams(FairParamList* list) list->add("yveff_MCFD", fyveff_MCFD); list->add("NumParamsTamexLE", fNumParamsTamexLE); list->add("NumParamsTamexTE", fNumParamsTamexTE); - + Int_t array_LE = 8 * fNumParamsTamexLE; LOG(info) << "Array size LOS Tamex LE matching: " << array_LE; fLEMatchParams->Set(array_LE); list->add("LosLEMatchPar", *fLEMatchParams); - + Int_t array_TE = 8 * fNumParamsTamexTE; LOG(info) << "Array size LOS Tamex TE matching: " << array_TE; fTEMatchParams->Set(array_TE); @@ -95,7 +95,7 @@ Bool_t R3BLosHitPar::getParams(FairParamList* list) LOG(info) << "---Could not initialize LosHit p1 Par"; return kFALSE; } - + if (!(list->fill("xoffset_MCFD", &fxoffset_MCFD))) { LOG(info) << "---Could not initialize LosHit xoffset_MCFD Par"; @@ -139,7 +139,7 @@ Bool_t R3BLosHitPar::getParams(FairParamList* list) LOG(info) << "Could not initialize LosLEMatchPar"; return kFALSE; } - + Int_t array_TE = 8 * fNumParamsTamexTE; fLEMatchParams->Set(array_TE); if (!(list->fill("LosTEMatchPar", fTEMatchParams))) @@ -165,7 +165,7 @@ void R3BLosHitPar::printParams() << " "; LOG(info) << fp0 << "\t" << fp1; - + LOG(info) << "R3BLosHitPar: LOS Tamex LE match par:"; LOG(info) << "Nb of Tamex LE match Par: "; LOG(info) << fNumParamsTamexLE; @@ -176,7 +176,7 @@ void R3BLosHitPar::printParams() LOG(info) << "FitParam(" << j << ") = " << fLEMatchParams->GetAt(i * fNumParamsTamexLE + j); } } - + LOG(info) << "R3BLosHitPar: LOS Tamex TE match par:"; LOG(info) << "Nb of Tamex TE match Par: "; LOG(info) << fNumParamsTamexTE; diff --git a/los/params/R3BLosHitPar.h b/los/params/R3BLosHitPar.h index 6c75d8ab1..69987374b 100644 --- a/los/params/R3BLosHitPar.h +++ b/los/params/R3BLosHitPar.h @@ -15,8 +15,8 @@ #define R3BLosHitPar_H #include "FairParGenericSet.h" -#include "TObjArray.h" #include "TArrayF.h" +#include "TObjArray.h" #include "TObject.h" #include @@ -73,6 +73,7 @@ class R3BLosHitPar : public FairParGenericSet int index = (pmt - 1) * fNumParamsTamexTE + indexpar - 1; fTEMatchParams->AddAt(val, index); } + private: Float_t fp0, fp1; Float_t fxoffset_MCFD, fyoffset_MCFD, fxveff_MCFD, fyveff_MCFD; diff --git a/lumon/ELILuMonContFact.cxx b/lumon/ELILuMonContFact.cxx index 930beda73..df58ac5c2 100644 --- a/lumon/ELILuMonContFact.cxx +++ b/lumon/ELILuMonContFact.cxx @@ -24,13 +24,13 @@ #include "ELILuMonContFact.h" -//#include "ELILuMonParRootFileIo.h" -//#include "ELILuMonParAsciiFileIo.h" +// #include "ELILuMonParRootFileIo.h" +// #include "ELILuMonParAsciiFileIo.h" #include "ELIGeoLuMonPar.h" -//#include "ELILuMonDigiPar.h" +// #include "ELILuMonDigiPar.h" #include "FairRuntimeDb.h" -//#include "CbmParTest.h" +// #include "CbmParTest.h" #include "FairParAsciiFileIo.h" #include "FairParRootFileIo.h" diff --git a/mtof/R3BmTofContFact.cxx b/mtof/R3BmTofContFact.cxx index dac42081b..765ac32fe 100644 --- a/mtof/R3BmTofContFact.cxx +++ b/mtof/R3BmTofContFact.cxx @@ -24,14 +24,14 @@ #include "R3BmTofContFact.h" -//#include "R3BmTofParRootFileIo.h" -//#include "R3BmTofParAsciiFileIo.h" +// #include "R3BmTofParRootFileIo.h" +// #include "R3BmTofParAsciiFileIo.h" #include "R3BGeomTofPar.h" -//#include "R3BmTofDigiPar.h" +// #include "R3BmTofDigiPar.h" #include "R3BTGeoPar.h" #include "FairRuntimeDb.h" -//#include "CbmParTest.h" +// #include "CbmParTest.h" #include "FairParAsciiFileIo.h" #include "FairParRootFileIo.h" diff --git a/neuland/calibration/R3BNeulandHitModulePar.h b/neuland/calibration/R3BNeulandHitModulePar.h index 9372f2469..7cdd67e90 100644 --- a/neuland/calibration/R3BNeulandHitModulePar.h +++ b/neuland/calibration/R3BNeulandHitModulePar.h @@ -21,7 +21,7 @@ #include "assert.h" // FIXME Do we need this??? -//#define NCHMAX 5000 +// #define NCHMAX 5000 class FairParamList; diff --git a/neuland/calibration/R3BNeulandHitPar.h b/neuland/calibration/R3BNeulandHitPar.h index 0a0f910b3..7c2dc1308 100644 --- a/neuland/calibration/R3BNeulandHitPar.h +++ b/neuland/calibration/R3BNeulandHitPar.h @@ -90,7 +90,10 @@ class R3BNeulandHitPar : public FairParGenericSet * @param idx an index of a module. * @return parameter container of this module. */ - R3BNeulandHitModulePar* GetModuleParAt(Int_t idx) const { return dynamic_cast(fParams->At(idx)); } + R3BNeulandHitModulePar* GetModuleParAt(Int_t idx) const + { + return dynamic_cast(fParams->At(idx)); + } // Global time offset in ns inline Double_t GetGlobalTimeOffset() const { return fGlobalTimeOffset; } diff --git a/neuland/calibration/R3BNeulandMapped2CalPar.h b/neuland/calibration/R3BNeulandMapped2CalPar.h index 27b1a5897..158af011d 100644 --- a/neuland/calibration/R3BNeulandMapped2CalPar.h +++ b/neuland/calibration/R3BNeulandMapped2CalPar.h @@ -14,8 +14,8 @@ #ifndef R3BNEULANDMAPPED2CALPAR_H #define R3BNEULANDMAPPED2CALPAR_H -#include #include "FairTask.h" +#include class R3BTCalPar; class R3BEventHeader; diff --git a/neuland/calibration/R3BNeulandParFact.cxx b/neuland/calibration/R3BNeulandParFact.cxx index 375205d2f..0caa99e09 100644 --- a/neuland/calibration/R3BNeulandParFact.cxx +++ b/neuland/calibration/R3BNeulandParFact.cxx @@ -28,7 +28,7 @@ #include "TList.h" // for TList #include "TString.h" // for TString -//#include // for strcmp, NULL +// #include // for strcmp, NULL static R3BNeulandParFact gR3BNeulandParFact; diff --git a/neuland/calibration/R3BNeulandTSyncer.cxx b/neuland/calibration/R3BNeulandTSyncer.cxx index 884422d02..6e3cc78a2 100644 --- a/neuland/calibration/R3BNeulandTSyncer.cxx +++ b/neuland/calibration/R3BNeulandTSyncer.cxx @@ -237,8 +237,9 @@ namespace Neuland std::vector lhs(numberOfEquations); const auto numberOfVariables = BarsPerPlane * nPlanes; - auto function = [&lhs, numberOfVariables]( - long mode, LSQR_DOUBLE_VECTOR* xVec, LSQR_DOUBLE_VECTOR* yVec, void* data) { + auto function = + [&lhs, numberOfVariables](long mode, LSQR_DOUBLE_VECTOR* xVec, LSQR_DOUBLE_VECTOR* yVec, void* data) + { double* x = xVec->elements; double* y = yVec->elements; diff --git a/neuland/clustering/R3BNeulandClusterFinder.cxx b/neuland/clustering/R3BNeulandClusterFinder.cxx index a761a3666..545f86466 100644 --- a/neuland/clustering/R3BNeulandClusterFinder.cxx +++ b/neuland/clustering/R3BNeulandClusterFinder.cxx @@ -27,11 +27,13 @@ R3BNeulandClusterFinder::R3BNeulandClusterFinder(const Double_t dx, , fDigis(input) , fClusters(output) { - fClusteringEngine.SetClusteringCondition([=](const R3BNeulandHit& a, const R3BNeulandHit& b) { - return std::abs(a.GetPosition().X() - b.GetPosition().X()) < dx && - std::abs(a.GetPosition().Y() - b.GetPosition().Y()) < dy && - std::abs(a.GetPosition().Z() - b.GetPosition().Z()) < dz && std::abs(a.GetT() - b.GetT()) < dt; - }); + fClusteringEngine.SetClusteringCondition( + [=](const R3BNeulandHit& a, const R3BNeulandHit& b) + { + return std::abs(a.GetPosition().X() - b.GetPosition().X()) < dx && + std::abs(a.GetPosition().Y() - b.GetPosition().Y()) < dy && + std::abs(a.GetPosition().Z() - b.GetPosition().Z()) < dz && std::abs(a.GetT() - b.GetT()) < dt; + }); } InitStatus R3BNeulandClusterFinder::Init() diff --git a/neuland/clustering/R3BNeulandClusterFinder.h b/neuland/clustering/R3BNeulandClusterFinder.h index a175bba12..ddec2a6df 100644 --- a/neuland/clustering/R3BNeulandClusterFinder.h +++ b/neuland/clustering/R3BNeulandClusterFinder.h @@ -24,12 +24,12 @@ * */ -#include #include "ClusteringEngine.h" #include "FairTask.h" #include "R3BNeulandCluster.h" #include "R3BNeulandHit.h" #include "TCAConnector.h" +#include class R3BNeulandClusterFinder : public FairTask { diff --git a/neuland/clustering/R3BNeulandClusterMon.cxx b/neuland/clustering/R3BNeulandClusterMon.cxx index d64d64941..cd57e6887 100644 --- a/neuland/clustering/R3BNeulandClusterMon.cxx +++ b/neuland/clustering/R3BNeulandClusterMon.cxx @@ -338,9 +338,9 @@ void R3BNeulandClusterMon::Exec(Option_t*) } } - std::sort(clusters.begin(), clusters.end(), [](const R3BNeulandCluster* a, const R3BNeulandCluster* b) { - return a->GetT() < b->GetT(); - }); + std::sort(clusters.begin(), + clusters.end(), + [](const R3BNeulandCluster* a, const R3BNeulandCluster* b) { return a->GetT() < b->GetT(); }); for (auto cluster : clusters) { diff --git a/neuland/digitizing/DigitizingEngine.cxx b/neuland/digitizing/DigitizingEngine.cxx index 064f4b417..b1ad2423c 100644 --- a/neuland/digitizing/DigitizingEngine.cxx +++ b/neuland/digitizing/DigitizingEngine.cxx @@ -146,10 +146,10 @@ namespace Neuland { compareValues[j] = CompareSignals(leftSignals[i], rightSignals[j]); } - auto compareValues_it = std::min_element( - compareValues.begin(), compareValues.end(), [](const Double_t& left, const Double_t& right) { - return left < right; - }); + auto compareValues_it = + std::min_element(compareValues.begin(), + compareValues.end(), + [](const Double_t& left, const Double_t& right) { return left < right; }); if (compareValues_it == compareValues.end()) LOG(fatal) << "DigitizingEngine.cxx::GetIndexMap(): failed to find minimum value!"; @@ -157,9 +157,10 @@ namespace Neuland valueMap[i] = *compareValues_it; auto indexMatch = static_cast(compareValues_it - compareValues.begin()); - auto findResult = std::find_if(indexMap.begin(), indexMap.end(), [indexMatch](const Pair& pair) { - return pair.right == indexMatch; - }); + auto findResult = + std::find_if(indexMap.begin(), + indexMap.end(), + [indexMatch](const Pair& pair) { return pair.right == indexMatch; }); if (findResult == indexMap.end()) { indexMap[i] = { i, indexMatch }; diff --git a/neuland/digitizing/DigitizingTacQuila.h b/neuland/digitizing/DigitizingTacQuila.h index b40321869..e13eb7622 100644 --- a/neuland/digitizing/DigitizingTacQuila.h +++ b/neuland/digitizing/DigitizingTacQuila.h @@ -45,7 +45,7 @@ namespace Neuland Double_t GetQDC() const; Double_t GetTDC() const; Double_t GetEnergy() const; - const Double_t GetTrigTime() const override { return GetTDC(); } + const Double_t GetTrigTime() const override { return GetTDC(); } private: // NOTE: Some expensive calculations and random distributions are cached @@ -66,7 +66,7 @@ namespace Neuland void ConstructSignals() const override { - fSignals.set({Signal{GetQDC(), GetTDC(), GetEnergy(), this->GetSide()}}); + fSignals.set({ Signal{ GetQDC(), GetTDC(), GetEnergy(), this->GetSide() } }); } }; diff --git a/neuland/digitizing/DigitizingTamex.cxx b/neuland/digitizing/DigitizingTamex.cxx index aa36f6d76..ec381531b 100644 --- a/neuland/digitizing/DigitizingTamex.cxx +++ b/neuland/digitizing/DigitizingTamex.cxx @@ -131,15 +131,18 @@ namespace Neuland while (it != fTmxPeaks.end()) { Int_t i = 0; - it = std::find_if(fTmxPeaks.begin(), fTmxPeaks.end(), [&](const TmxPeak& p) { - bool res = false; - if (index != i) - { - res = (p == fTmxPeaks[index]); - } - i++; - return res; - }); + it = std::find_if(fTmxPeaks.begin(), + fTmxPeaks.end(), + [&](const TmxPeak& p) + { + bool res = false; + if (index != i) + { + res = (p == fTmxPeaks[index]); + } + i++; + return res; + }); if (it == fTmxPeaks.end()) continue; @@ -215,9 +218,10 @@ namespace Neuland auto signals = std::vector{}; signals.reserve(fTmxPeaks.size()); - std::transform(fTmxPeaks.begin(), fTmxPeaks.end(), std::back_inserter(signals), [](TmxPeak& peak) { - return static_cast(peak); - }); + std::transform(fTmxPeaks.begin(), + fTmxPeaks.end(), + std::back_inserter(signals), + [](TmxPeak& peak) { return static_cast(peak); }); RemoveZero(signals); fSignals.set(std::move(signals)); } diff --git a/neuland/digitizing/DigitizingTamex.h b/neuland/digitizing/DigitizingTamex.h index 96390436a..de282733b 100644 --- a/neuland/digitizing/DigitizingTamex.h +++ b/neuland/digitizing/DigitizingTamex.h @@ -87,7 +87,7 @@ namespace Neuland // Getters: const Tamex::Params& GetPar() const { return par; } const std::vector& GetTmxPeaks() const { return fTmxPeaks; } - const Double_t GetTrigTime() const override; + const Double_t GetTrigTime() const override; void SetPaddle(Digitizing::Paddle* paddle) override; Signal TmxPeakToSignal(const TmxPeak& peak) const; diff --git a/neuland/digitizing/R3BNeulandDigitizer.cxx b/neuland/digitizing/R3BNeulandDigitizer.cxx index e670b2303..a07a64f6e 100644 --- a/neuland/digitizing/R3BNeulandDigitizer.cxx +++ b/neuland/digitizing/R3BNeulandDigitizer.cxx @@ -126,15 +126,13 @@ void R3BNeulandDigitizer::Exec(Option_t*) // Fill control histograms hMultOne->Fill(std::count_if(paddles.begin(), paddles.end(), - [](const std::pair>& kv) { - return kv.second->HasHalfFired(); - })); + [](const std::pair>& kv) + { return kv.second->HasHalfFired(); })); hMultTwo->Fill(std::count_if(paddles.begin(), paddles.end(), - [](const std::pair>& kv) { - return kv.second->HasFired(); - })); + [](const std::pair>& kv) + { return kv.second->HasFired(); })); // Create Hits for (const auto& kv : paddles) diff --git a/neuland/digitizing/R3BNeulandDigitizer.h b/neuland/digitizing/R3BNeulandDigitizer.h index 7c4d2bffe..65b26adba 100644 --- a/neuland/digitizing/R3BNeulandDigitizer.h +++ b/neuland/digitizing/R3BNeulandDigitizer.h @@ -14,7 +14,6 @@ #ifndef R3B_NEULAND_DIGITIZER_H #define R3B_NEULAND_DIGITIZER_H -#include #include "DigitizingEngine.h" #include "FairTask.h" #include "Filterable.h" @@ -23,6 +22,7 @@ #include "R3BNeulandHitPar.h" #include "R3BNeulandPoint.h" #include "TCAConnector.h" +#include class TGeoNode; class TH1F; diff --git a/neuland/digitizing/R3BNeulandHitMon.cxx b/neuland/digitizing/R3BNeulandHitMon.cxx index 05d573c8f..695889a39 100644 --- a/neuland/digitizing/R3BNeulandHitMon.cxx +++ b/neuland/digitizing/R3BNeulandHitMon.cxx @@ -92,10 +92,10 @@ void R3BNeulandHitMon::Exec(Option_t*) if (result.second == false) result.first->second++; } - auto max = std::max_element( - paddlenum.begin(), paddlenum.end(), [](std::pair lhs, std::pair rhs) { - return (lhs.second < rhs.second); - }); + auto max = std::max_element(paddlenum.begin(), + paddlenum.end(), + [](std::pair lhs, std::pair rhs) + { return (lhs.second < rhs.second); }); LOG(debug) << "max dupli: " << max->second; if (fIs3DTrackEnabled) @@ -133,9 +133,10 @@ void R3BNeulandHitMon::Exec(Option_t*) } } - auto maxDepthHit = std::max_element(hits.begin(), hits.end(), [](R3BNeulandHit* a, R3BNeulandHit* b) { - return a->GetPosition().Z() < b->GetPosition().Z(); - }); + auto maxDepthHit = std::max_element(hits.begin(), + hits.end(), + [](R3BNeulandHit* a, R3BNeulandHit* b) + { return a->GetPosition().Z() < b->GetPosition().Z(); }); if (maxDepthHit != hits.end()) { hDepth->Fill((*maxDepthHit)->GetPosition().Z()); @@ -143,9 +144,10 @@ void R3BNeulandHitMon::Exec(Option_t*) hDepthVSSternmostEnergy->Fill((*maxDepthHit)->GetPosition().Z(), (*maxDepthHit)->GetE()); } - auto minDepthHit = std::min_element(hits.begin(), hits.end(), [](R3BNeulandHit* a, R3BNeulandHit* b) { - return a->GetPosition().Z() < b->GetPosition().Z(); - }); + auto minDepthHit = std::min_element(hits.begin(), + hits.end(), + [](R3BNeulandHit* a, R3BNeulandHit* b) + { return a->GetPosition().Z() < b->GetPosition().Z(); }); auto Etot = std::accumulate( hits.begin(), hits.end(), Double_t(0.), [](const Double_t a, R3BNeulandHit* b) { return a + b->GetE(); }); diff --git a/neuland/geobase/helper_neuland_geometry.C b/neuland/geobase/helper_neuland_geometry.C index f4b0ac780..6844d363e 100644 --- a/neuland/geobase/helper_neuland_geometry.C +++ b/neuland/geobase/helper_neuland_geometry.C @@ -22,104 +22,105 @@ const Double_t gBC408Thickness = 2.4; const Double_t gAlThickness = 0.02; const Double_t gTapeThickness = 0.05; -TGeoMedium *BuildMaterial(const TString material, FairGeoMedia *geoMedia, - FairGeoBuilder *geoBuild) { - FairGeoMedium *fairMedium = geoMedia->getMedium(material); - if (!fairMedium) { - std::cout << "FairGeoMedium " << material << " not found" << std::endl; - } +TGeoMedium* BuildMaterial(const TString material, FairGeoMedia* geoMedia, FairGeoBuilder* geoBuild) +{ + FairGeoMedium* fairMedium = geoMedia->getMedium(material); + if (!fairMedium) + { + std::cout << "FairGeoMedium " << material << " not found" << std::endl; + } - geoBuild->createMedium(fairMedium); - TGeoMedium *med = gGeoManager->GetMedium(material); - if (!med) { - std::cout << "TGeoMedium " << material << " not found" << std::endl; - } - return med; + geoBuild->createMedium(fairMedium); + TGeoMedium* med = gGeoManager->GetMedium(material); + if (!med) + { + std::cout << "TGeoMedium " << material << " not found" << std::endl; + } + return med; } /** Building the shape of a paddle The paddle end cones are created by intersection ("*") of a small box (width*width*coneLength) with a cone The intersected structures are moved, rotated and then to a base box (length*width*width) */ -TGeoShape *BuildPaddleShape(const TString &name, const Double_t length, - const Double_t width, const Double_t coneRadius, - const Double_t coneLength) { - new TGeoBBox(name + "Box", length, width, width); - new TGeoCone(name + "Cone", coneLength + 0.001, 0., coneRadius, 0., - width * TMath::Sqrt(2.)); - new TGeoBBox(name + "Conebox", width, width, coneLength); - TGeoShape *shape = new TGeoCompositeShape( - name, name + "Box + ((" + name + "Conebox*" + name + "Cone):trc1) + ((" + - name + "Conebox*" + name + "Cone):trc2)"); - return shape; +TGeoShape* BuildPaddleShape(const TString& name, + const Double_t length, + const Double_t width, + const Double_t coneRadius, + const Double_t coneLength) +{ + new TGeoBBox(name + "Box", length, width, width); + new TGeoCone(name + "Cone", coneLength + 0.001, 0., coneRadius, 0., width * TMath::Sqrt(2.)); + new TGeoBBox(name + "Conebox", width, width, coneLength); + TGeoShape* shape = new TGeoCompositeShape( + name, + name + "Box + ((" + name + "Conebox*" + name + "Cone):trc1) + ((" + name + "Conebox*" + name + "Cone):trc2)"); + return shape; } /** A paddle consists of the scintillator volume, wrapped with Al and Tape. The shapes for the wrappings are created by subtracting the solid inner part from a larger solid volume */ -TGeoVolume *BuildPaddleVolume() { - // Load Interfaces to build materials - FairGeoLoader *geoLoad = FairGeoLoader::Instance(); - FairGeoInterface *geoFace = geoLoad->getGeoInterface(); - geoFace->setMediaFile(TString(gSystem->Getenv("VMCWORKDIR")) + - "/geometry/media_r3b.geo"); - geoFace->readMedia(); - FairGeoBuilder *geoBuild = geoLoad->getGeoBuilder(); - FairGeoMedia *geoMedia = geoFace->getMedia(); - const TGeoMedium *medBC408 = BuildMaterial("BC408", geoMedia, geoBuild); - const TGeoMedium *medCH2 = BuildMaterial("polyethylene", geoMedia, geoBuild); - const TGeoMedium *medAl = BuildMaterial("aluminium", geoMedia, geoBuild); +TGeoVolume* BuildPaddleVolume() +{ + // Load Interfaces to build materials + FairGeoLoader* geoLoad = FairGeoLoader::Instance(); + FairGeoInterface* geoFace = geoLoad->getGeoInterface(); + geoFace->setMediaFile(TString(gSystem->Getenv("VMCWORKDIR")) + "/geometry/media_r3b.geo"); + geoFace->readMedia(); + FairGeoBuilder* geoBuild = geoLoad->getGeoBuilder(); + FairGeoMedia* geoMedia = geoFace->getMedia(); + const TGeoMedium* medBC408 = BuildMaterial("BC408", geoMedia, geoBuild); + const TGeoMedium* medCH2 = BuildMaterial("polyethylene", geoMedia, geoBuild); + const TGeoMedium* medAl = BuildMaterial("aluminium", geoMedia, geoBuild); - // Prepare Transformations for cones - TGeoRotation *r1 = new TGeoRotation(); - r1->RotateY(90); - TGeoCombiTrans *trc1 = new TGeoCombiTrans( - TGeoTranslation(-(gPaddleBaseLength + gPaddleConeLength), 0., 0.), *r1); - trc1->SetName("trc1"); - trc1->RegisterYourself(); + // Prepare Transformations for cones + TGeoRotation* r1 = new TGeoRotation(); + r1->RotateY(90); + TGeoCombiTrans* trc1 = new TGeoCombiTrans(TGeoTranslation(-(gPaddleBaseLength + gPaddleConeLength), 0., 0.), *r1); + trc1->SetName("trc1"); + trc1->RegisterYourself(); - TGeoRotation *r2 = new TGeoRotation(); - r2->RotateY(-90); - TGeoCombiTrans *trc2 = new TGeoCombiTrans( - TGeoTranslation(+(gPaddleBaseLength + gPaddleConeLength), 0., 0.), *r2); - trc2->SetName("trc2"); - trc2->RegisterYourself(); + TGeoRotation* r2 = new TGeoRotation(); + r2->RotateY(-90); + TGeoCombiTrans* trc2 = new TGeoCombiTrans(TGeoTranslation(+(gPaddleBaseLength + gPaddleConeLength), 0., 0.), *r2); + trc2->SetName("trc2"); + trc2->RegisterYourself(); - // Build shapes - const TGeoShape *shapeBC408 = - BuildPaddleShape("shapeBC408", gPaddleBaseLength, gBC408Thickness, - gBC408ConeRadius, gPaddleConeLength); + // Build shapes + const TGeoShape* shapeBC408 = + BuildPaddleShape("shapeBC408", gPaddleBaseLength, gBC408Thickness, gBC408ConeRadius, gPaddleConeLength); - BuildPaddleShape("shapeAlWrappingSolid", gPaddleBaseLength, - gBC408Thickness + gAlThickness, - gBC408ConeRadius + gAlThickness, gPaddleConeLength); - const TGeoShape *shapeAlWrapping = new TGeoCompositeShape( - "shapeAlWrapping", "shapeAlWrappingSolid - shapeBC408"); + BuildPaddleShape("shapeAlWrappingSolid", + gPaddleBaseLength, + gBC408Thickness + gAlThickness, + gBC408ConeRadius + gAlThickness, + gPaddleConeLength); + const TGeoShape* shapeAlWrapping = new TGeoCompositeShape("shapeAlWrapping", "shapeAlWrappingSolid - shapeBC408"); - BuildPaddleShape("shapeTapeWrappingSolid", gPaddleBaseLength, - gBC408Thickness + gAlThickness + gTapeThickness, - gBC408ConeRadius + gAlThickness + gTapeThickness, - gPaddleConeLength); - const TGeoShape *shapeTapeWrapping = new TGeoCompositeShape( - "shapeTapeWrapping", "shapeTapeWrappingSolid - shapeAlWrappingSolid"); + BuildPaddleShape("shapeTapeWrappingSolid", + gPaddleBaseLength, + gBC408Thickness + gAlThickness + gTapeThickness, + gBC408ConeRadius + gAlThickness + gTapeThickness, + gPaddleConeLength); + const TGeoShape* shapeTapeWrapping = + new TGeoCompositeShape("shapeTapeWrapping", "shapeTapeWrappingSolid - shapeAlWrappingSolid"); - // Build Volumes. Note that the volume names are important and reappear in - // R3BNeuland() - TGeoVolume *volBC408 = new TGeoVolume("volBC408", shapeBC408, medBC408); - volBC408->SetLineColor(33); // greyish plue - volBC408->SetTransparency(30); - TGeoVolume *volAlWrapping = - new TGeoVolume("volAlWrapping", shapeAlWrapping, medAl); - volAlWrapping->SetLineColor(17); // grey/silver - TGeoVolume *volTapeWrapping = - new TGeoVolume("volTapeWrapping", shapeTapeWrapping, medCH2); - volTapeWrapping->SetLineColor(1); // black + // Build Volumes. Note that the volume names are important and reappear in + // R3BNeuland() + TGeoVolume* volBC408 = new TGeoVolume("volBC408", shapeBC408, medBC408); + volBC408->SetLineColor(33); // greyish plue + volBC408->SetTransparency(30); + TGeoVolume* volAlWrapping = new TGeoVolume("volAlWrapping", shapeAlWrapping, medAl); + volAlWrapping->SetLineColor(17); // grey/silver + TGeoVolume* volTapeWrapping = new TGeoVolume("volTapeWrapping", shapeTapeWrapping, medCH2); + volTapeWrapping->SetLineColor(1); // black - // Make the elementary assembly - TGeoVolume *volPaddle = new TGeoVolumeAssembly("volPaddle"); - volPaddle->AddNode(volBC408, 1); - volPaddle->AddNode(volAlWrapping, 1); - volPaddle->AddNode(volTapeWrapping, 1); + // Make the elementary assembly + TGeoVolume* volPaddle = new TGeoVolumeAssembly("volPaddle"); + volPaddle->AddNode(volBC408, 1); + volPaddle->AddNode(volAlWrapping, 1); + volPaddle->AddNode(volTapeWrapping, 1); - return volPaddle; + return volPaddle; } diff --git a/neuland/online/R3BNeulandOnlineReconstruction.cxx b/neuland/online/R3BNeulandOnlineReconstruction.cxx index a8a17650d..2061c70ad 100644 --- a/neuland/online/R3BNeulandOnlineReconstruction.cxx +++ b/neuland/online/R3BNeulandOnlineReconstruction.cxx @@ -205,10 +205,10 @@ void R3BNeulandOnlineReconstruction::Exec(Option_t*) } } - const double etot = - std::accumulate(clusters.begin(), clusters.end(), 0., [](const double sum, const R3BNeulandCluster* c) { - return sum + c->GetE(); - }); + const double etot = std::accumulate(clusters.begin(), + clusters.end(), + 0., + [](const double sum, const R3BNeulandCluster* c) { return sum + c->GetE(); }); if (etot > 10) { hEtotVSNClusters->Fill(etot, nClusters); diff --git a/neuland/preexp/R3BNeulandCheckMapping.h b/neuland/preexp/R3BNeulandCheckMapping.h index 7f11c5f78..b5ff28c80 100644 --- a/neuland/preexp/R3BNeulandCheckMapping.h +++ b/neuland/preexp/R3BNeulandCheckMapping.h @@ -14,12 +14,12 @@ #ifndef R3BNEULANDCHECKMAPPING_H #define R3BNEULANDCHECKMAPPING_H -#include #include "FairTask.h" #include "R3BChannelAccessEPICS.h" #include "R3BEventHeader.h" #include "TH1.h" #include "TTimeStamp.h" +#include class R3BNeulandCheckMapping : public FairTask { diff --git a/neuland/preexp/R3BNeulandGainMatching.cxx b/neuland/preexp/R3BNeulandGainMatching.cxx index d142c891e..a973b37eb 100644 --- a/neuland/preexp/R3BNeulandGainMatching.cxx +++ b/neuland/preexp/R3BNeulandGainMatching.cxx @@ -14,8 +14,8 @@ #include "R3BNeulandGainMatching.h" #include "R3BNeulandCalData.h" #include "TF1.h" -#include "TSpectrum.h" #include "TFile.h" +#include "TSpectrum.h" #include #include diff --git a/neuland/preexp/R3BNeulandGainMatching.h b/neuland/preexp/R3BNeulandGainMatching.h index bcfdea9bb..83a4e3894 100644 --- a/neuland/preexp/R3BNeulandGainMatching.h +++ b/neuland/preexp/R3BNeulandGainMatching.h @@ -14,11 +14,11 @@ #ifndef R3BNEULANDGAINMATCHING_H #define R3BNEULANDGAINMATCHING_H -#include #include "FairTask.h" #include "R3BChannelAccessEPICS.h" #include "R3BEventHeader.h" #include "TH1.h" +#include class R3BNeulandGainMatching : public FairTask { diff --git a/neuland/preexp/R3BNeulandTimeRes.cxx b/neuland/preexp/R3BNeulandTimeRes.cxx index 097e966c0..6956a7358 100644 --- a/neuland/preexp/R3BNeulandTimeRes.cxx +++ b/neuland/preexp/R3BNeulandTimeRes.cxx @@ -15,9 +15,9 @@ #include "R3BNeulandCalData.h" #include "TF1.h" #include "TF2.h" +#include "TFile.h" #include "TMath.h" #include "TSpectrum.h" -#include "TFile.h" #include #include diff --git a/neuland/reconstruction/R3BNeulandNeutronReconstructionMon.cxx b/neuland/reconstruction/R3BNeulandNeutronReconstructionMon.cxx index 7c77fd0ad..5620c6913 100644 --- a/neuland/reconstruction/R3BNeulandNeutronReconstructionMon.cxx +++ b/neuland/reconstruction/R3BNeulandNeutronReconstructionMon.cxx @@ -52,9 +52,8 @@ Double_t Score(const std::vector>& com return std::accumulate(combination.begin(), combination.end(), 0., - [](const Double_t sum, const std::pair& pair) { - return sum + Distance(pair.first, pair.second); - }); + [](const Double_t sum, const std::pair& pair) + { return sum + Distance(pair.first, pair.second); }); } template @@ -113,7 +112,8 @@ InitStatus R3BNeulandNeutronReconstructionMon::Init() LOG(fatal) << "R3BNeulandNeutronReconstructionMon::Init No " << fInput << "!"; return kFATAL; } - if (!TString((dynamic_cast(ioman->GetObject(fInput)))->GetClass()->GetName()).EqualTo("R3BNeulandNeutron")) + if (!TString((dynamic_cast(ioman->GetObject(fInput)))->GetClass()->GetName()) + .EqualTo("R3BNeulandNeutron")) { LOG(fatal) << "R3BNeulandNeutronReconstructionMon::Init Branch " << fInput << " does not contain " @@ -143,7 +143,8 @@ InitStatus R3BNeulandNeutronReconstructionMon::Init() LOG(fatal) << "R3BNeulandNeutronReconstructionMon::Init No MCTrack!"; return kFATAL; } - if (!TString((dynamic_cast(ioman->GetObject("MCTrack")))->GetClass()->GetName()).EqualTo("R3BMCTrack")) + if (!TString((dynamic_cast(ioman->GetObject("MCTrack")))->GetClass()->GetName()) + .EqualTo("R3BMCTrack")) { LOG(fatal) << "R3BNeulandNeutronReconstructionMon::Init Branch MCTrack " "does not contain FairMCPoints!"; diff --git a/neuland/reconstruction/R3BNeulandNeutronReconstructionStatistics.cxx b/neuland/reconstruction/R3BNeulandNeutronReconstructionStatistics.cxx index 13df0e216..e13ef841c 100644 --- a/neuland/reconstruction/R3BNeulandNeutronReconstructionStatistics.cxx +++ b/neuland/reconstruction/R3BNeulandNeutronReconstructionStatistics.cxx @@ -78,7 +78,8 @@ void R3BNeulandNeutronReconstructionStatistics::Exec(Option_t*) const auto actualNegative = fSecondaryClusters.Retrieve(); const auto predictedPositive = fPredictedNeutrons.Retrieve(); - auto comp = [](const R3BNeulandNeutron* n, const R3BNeulandCluster* c) { + auto comp = [](const R3BNeulandNeutron* n, const R3BNeulandCluster* c) + { return almost_equal(c->GetT(), n->GetT(), 2) && almost_equal(c->GetPosition().X(), n->GetPosition().X(), 2) && almost_equal(c->GetPosition().Y(), n->GetPosition().Y(), 2) && almost_equal(c->GetPosition().Z(), n->GetPosition().Z(), 2); @@ -125,7 +126,8 @@ void R3BNeulandNeutronReconstructionStatistics::Exec(Option_t*) const double precision = truePositives / (truePositives + falsePositives); const double recall = truePositives / (truePositives + falseNegatives); - auto Fbeta = [&](double beta) { + auto Fbeta = [&](double beta) + { if (precision == 0. && recall == 0.) return 0.; return (1. + beta * beta) * (precision * recall) / ((beta * beta * precision) + recall); @@ -151,9 +153,8 @@ void R3BNeulandNeutronReconstructionStatistics::Finish() const double precision = (double)fTP / ((double)fTP + (double)fFP); const double recall = (double)fTP / ((double)fTP + (double)fFN); - auto Fbeta = [&](double beta) { - return (1. + beta * beta) * (precision * recall) / ((beta * beta * precision) + recall); - }; + auto Fbeta = [&](double beta) + { return (1. + beta * beta) * (precision * recall) / ((beta * beta * precision) + recall); }; const double accuracy = (double)(fTP + fTN) / (double)(fTP + fTN + fFP + fFN); fOut << "PREC DATA" diff --git a/neuland/reconstruction/multiplicity/R3BNeulandMultiplicityCalorimetric.cxx b/neuland/reconstruction/multiplicity/R3BNeulandMultiplicityCalorimetric.cxx index 6d9166efe..6fbaf1001 100644 --- a/neuland/reconstruction/multiplicity/R3BNeulandMultiplicityCalorimetric.cxx +++ b/neuland/reconstruction/multiplicity/R3BNeulandMultiplicityCalorimetric.cxx @@ -38,7 +38,8 @@ InitStatus R3BNeulandMultiplicityCalorimetric::Init() LOG(fatal) << "R3BNeulandMultiplicityCalorimetric::Init: No FairRuntimeDb!"; return kFATAL; } - fPar = dynamic_cast(rtdb->getContainer("R3BNeulandMultiplicityCalorimetricPar")); + fPar = dynamic_cast( + rtdb->getContainer("R3BNeulandMultiplicityCalorimetricPar")); if (fPar == nullptr) { LOG(fatal) << "R3BNeulandMultiplicityCalorimetric::Init: No R3BNeulandMultiplicityCalorimetricPar!"; @@ -55,10 +56,10 @@ void R3BNeulandMultiplicityCalorimetric::Exec(Option_t*) fMultiplicity->m.fill(0.); const auto clusters = fClusters.Retrieve(); - const auto Etot = - std::accumulate(clusters.cbegin(), clusters.cend(), 0., [](const Double_t a, const R3BNeulandCluster* b) { - return a + b->GetE(); - }); + const auto Etot = std::accumulate(clusters.cbegin(), + clusters.cend(), + 0., + [](const Double_t a, const R3BNeulandCluster* b) { return a + b->GetE(); }); const auto nClusters = clusters.size(); // Calorimetric Multiplicity is One-Hot diff --git a/neuland/reconstruction/multiplicity/R3BNeulandMultiplicityCalorimetricTrain.cxx b/neuland/reconstruction/multiplicity/R3BNeulandMultiplicityCalorimetricTrain.cxx index ef7d1c64e..dcf7439f1 100644 --- a/neuland/reconstruction/multiplicity/R3BNeulandMultiplicityCalorimetricTrain.cxx +++ b/neuland/reconstruction/multiplicity/R3BNeulandMultiplicityCalorimetricTrain.cxx @@ -6,7 +6,7 @@ #include "Math/Factory.h" #include "Math/Functor.h" #include "Math/Minimizer.h" -//#include "Math/GeneticMinimizer.h" +// #include "Math/GeneticMinimizer.h" #include "TDirectory.h" #include #include @@ -72,7 +72,8 @@ InitStatus R3BNeulandMultiplicityCalorimetricTrain::Init() LOG(fatal) << "R3BNeulandMultiplicityCalorimetricTrain::Init: No FairRuntimeDb!"; return kFATAL; } - fPar = dynamic_cast(rtdb->getContainer("R3BNeulandMultiplicityCalorimetricPar")); + fPar = dynamic_cast( + rtdb->getContainer("R3BNeulandMultiplicityCalorimetricPar")); if (fPar == nullptr) { LOG(fatal) << "R3BNeulandMultiplicityCalorimetricTrain::Init: No R3BNeulandMultiplicityCalorimetricPar!"; diff --git a/neuland/reconstruction/neutrons/R3BNeulandNeutronsRValue.cxx b/neuland/reconstruction/neutrons/R3BNeulandNeutronsRValue.cxx index 2eb5a1a0d..1de8b0fd3 100644 --- a/neuland/reconstruction/neutrons/R3BNeulandNeutronsRValue.cxx +++ b/neuland/reconstruction/neutrons/R3BNeulandNeutronsRValue.cxx @@ -53,17 +53,18 @@ void R3BNeulandNeutronsRValue::Exec(Option_t*) void R3BNeulandNeutronsRValue::SortClustersByRValue(std::vector& clusters) const { - std::sort(clusters.begin(), clusters.end(), [&](const R3BNeulandCluster* a, const R3BNeulandCluster* b) { - return a->GetRECluster(fEkinRefMeV) < b->GetRECluster(fEkinRefMeV); - }); + std::sort(clusters.begin(), + clusters.end(), + [&](const R3BNeulandCluster* a, const R3BNeulandCluster* b) + { return a->GetRECluster(fEkinRefMeV) < b->GetRECluster(fEkinRefMeV); }); } void R3BNeulandNeutronsRValue::PrioritizeTimeWiseFirstCluster(std::vector& clusters) const { auto timewiseFirstCluster = - std::min_element(clusters.begin(), clusters.end(), [](const R3BNeulandCluster* a, const R3BNeulandCluster* b) { - return a->GetT() < b->GetT(); - }); + std::min_element(clusters.begin(), + clusters.end(), + [](const R3BNeulandCluster* a, const R3BNeulandCluster* b) { return a->GetT() < b->GetT(); }); // Put first cluster in front std::rotate(clusters.begin(), timewiseFirstCluster, timewiseFirstCluster + 1); } @@ -79,9 +80,8 @@ void R3BNeulandNeutronsRValue::FilterClustersByKineticEnergy(std::vectorGetEToF() - fEkinRefMeV) / fEkinRefMeV > 0.05; - }), + [&](const R3BNeulandCluster* a) + { return std::abs(a->GetEToF() - fEkinRefMeV) / fEkinRefMeV > 0.05; }), clusters.end()); } diff --git a/neuland/test/calibration/testNeulandTracker.C b/neuland/test/calibration/testNeulandTracker.C index f12143ceb..daa6cfc13 100644 --- a/neuland/test/calibration/testNeulandTracker.C +++ b/neuland/test/calibration/testNeulandTracker.C @@ -11,4 +11,4 @@ * or submit itself to any jurisdiction. * ******************************************************************************/ -//FIXME implement me plz =) \ No newline at end of file +// FIXME implement me plz =) \ No newline at end of file diff --git a/neuland/test/testClusteringEngine.cxx b/neuland/test/testClusteringEngine.cxx index 79e255ece..f97be2604 100644 --- a/neuland/test/testClusteringEngine.cxx +++ b/neuland/test/testClusteringEngine.cxx @@ -46,8 +46,8 @@ namespace }; auto clusterer = Neuland::ClusteringEngine(); - clusterer.SetClusteringCondition( - [](const DummyDigi& a, const DummyDigi& b) { return std::abs(b.a - a.a) <= 1; }); + clusterer.SetClusteringCondition([](const DummyDigi& a, const DummyDigi& b) + { return std::abs(b.a - a.a) <= 1; }); std::vector digis{ 28, 13, 23, 22, 15, 16, 3, 6, 4, 26, 10, 11, 19, 8, 29, 12, 25, 30, 17, 18, 24 }; std::vector> clusters = clusterer.Clusterize(digis); diff --git a/pdc/mapping_pdc_trig.hh b/pdc/mapping_pdc_trig.hh index a03ee83b4..1a67f06bd 100644 --- a/pdc/mapping_pdc_trig.hh +++ b/pdc/mapping_pdc_trig.hh @@ -1,516 +1,517 @@ // Generated Mon Jul 6 11:44:01 CEST 2020 -unsigned g_pdc_trig_map[4][144] = {{0}}; -void pdc_trig_map_setup() { - g_pdc_trig_map[0][0] = 0; - g_pdc_trig_map[0][1] = 0; - g_pdc_trig_map[0][2] = 0; - g_pdc_trig_map[0][3] = 0; - g_pdc_trig_map[0][4] = 0; - g_pdc_trig_map[0][5] = 0; - g_pdc_trig_map[0][6] = 0; - g_pdc_trig_map[0][7] = 0; - g_pdc_trig_map[0][8] = 0; - g_pdc_trig_map[0][9] = 0; - g_pdc_trig_map[0][10] = 0; - g_pdc_trig_map[0][11] = 0; - g_pdc_trig_map[0][12] = 0; - g_pdc_trig_map[0][13] = 0; - g_pdc_trig_map[0][14] = 0; - g_pdc_trig_map[0][15] = 0; - g_pdc_trig_map[0][16] = 0; - g_pdc_trig_map[0][17] = 0; - g_pdc_trig_map[0][18] = 0; - g_pdc_trig_map[0][19] = 0; - g_pdc_trig_map[0][20] = 0; - g_pdc_trig_map[0][21] = 0; - g_pdc_trig_map[0][22] = 0; - g_pdc_trig_map[0][23] = 0; - g_pdc_trig_map[0][24] = 0; - g_pdc_trig_map[0][25] = 0; - g_pdc_trig_map[0][26] = 0; - g_pdc_trig_map[0][27] = 0; - g_pdc_trig_map[0][28] = 0; - g_pdc_trig_map[0][29] = 0; - g_pdc_trig_map[0][30] = 0; - g_pdc_trig_map[0][31] = 0; - g_pdc_trig_map[0][32] = 0; - g_pdc_trig_map[0][33] = 0; - g_pdc_trig_map[0][34] = 0; - g_pdc_trig_map[0][35] = 0; - g_pdc_trig_map[0][36] = 0; - g_pdc_trig_map[0][37] = 0; - g_pdc_trig_map[0][38] = 0; - g_pdc_trig_map[0][39] = 0; - g_pdc_trig_map[0][40] = 0; - g_pdc_trig_map[0][41] = 0; - g_pdc_trig_map[0][42] = 0; - g_pdc_trig_map[0][43] = 0; - g_pdc_trig_map[0][44] = 0; - g_pdc_trig_map[0][45] = 0; - g_pdc_trig_map[0][46] = 0; - g_pdc_trig_map[0][47] = 0; - g_pdc_trig_map[0][48] = 0; - g_pdc_trig_map[0][49] = 0; - g_pdc_trig_map[0][50] = 0; - g_pdc_trig_map[0][51] = 0; - g_pdc_trig_map[0][52] = 0; - g_pdc_trig_map[0][53] = 0; - g_pdc_trig_map[0][54] = 0; - g_pdc_trig_map[0][55] = 0; - g_pdc_trig_map[0][56] = 0; - g_pdc_trig_map[0][57] = 0; - g_pdc_trig_map[0][58] = 0; - g_pdc_trig_map[0][59] = 0; - g_pdc_trig_map[0][60] = 0; - g_pdc_trig_map[0][61] = 0; - g_pdc_trig_map[0][62] = 0; - g_pdc_trig_map[0][63] = 0; - g_pdc_trig_map[0][64] = 0; - g_pdc_trig_map[0][65] = 0; - g_pdc_trig_map[0][66] = 0; - g_pdc_trig_map[0][67] = 0; - g_pdc_trig_map[0][68] = 0; - g_pdc_trig_map[0][69] = 0; - g_pdc_trig_map[0][70] = 0; - g_pdc_trig_map[0][71] = 0; - g_pdc_trig_map[0][72] = 0; - g_pdc_trig_map[0][73] = 0; - g_pdc_trig_map[0][74] = 0; - g_pdc_trig_map[0][75] = 0; - g_pdc_trig_map[0][76] = 0; - g_pdc_trig_map[0][77] = 0; - g_pdc_trig_map[0][78] = 0; - g_pdc_trig_map[0][79] = 0; - g_pdc_trig_map[0][80] = 0; - g_pdc_trig_map[0][81] = 0; - g_pdc_trig_map[0][82] = 0; - g_pdc_trig_map[0][83] = 0; - g_pdc_trig_map[0][84] = 0; - g_pdc_trig_map[0][85] = 0; - g_pdc_trig_map[0][86] = 0; - g_pdc_trig_map[0][87] = 0; - g_pdc_trig_map[0][88] = 0; - g_pdc_trig_map[0][89] = 0; - g_pdc_trig_map[0][90] = 0; - g_pdc_trig_map[0][91] = 0; - g_pdc_trig_map[0][92] = 0; - g_pdc_trig_map[0][93] = 0; - g_pdc_trig_map[0][94] = 0; - g_pdc_trig_map[0][95] = 0; - g_pdc_trig_map[0][96] = 0; - g_pdc_trig_map[0][97] = 0; - g_pdc_trig_map[0][98] = 0; - g_pdc_trig_map[0][99] = 0; - g_pdc_trig_map[0][100] = 0; - g_pdc_trig_map[0][101] = 0; - g_pdc_trig_map[0][102] = 0; - g_pdc_trig_map[0][103] = 0; - g_pdc_trig_map[0][104] = 0; - g_pdc_trig_map[0][105] = 0; - g_pdc_trig_map[0][106] = 0; - g_pdc_trig_map[0][107] = 0; - g_pdc_trig_map[0][108] = 0; - g_pdc_trig_map[0][109] = 0; - g_pdc_trig_map[0][110] = 0; - g_pdc_trig_map[0][111] = 0; - g_pdc_trig_map[0][112] = 0; - g_pdc_trig_map[0][113] = 0; - g_pdc_trig_map[0][114] = 0; - g_pdc_trig_map[0][115] = 0; - g_pdc_trig_map[0][116] = 0; - g_pdc_trig_map[0][117] = 0; - g_pdc_trig_map[0][118] = 0; - g_pdc_trig_map[0][119] = 0; - g_pdc_trig_map[0][120] = 0; - g_pdc_trig_map[0][121] = 0; - g_pdc_trig_map[0][122] = 0; - g_pdc_trig_map[0][123] = 0; - g_pdc_trig_map[0][124] = 0; - g_pdc_trig_map[0][125] = 0; - g_pdc_trig_map[0][126] = 0; - g_pdc_trig_map[0][127] = 0; - g_pdc_trig_map[0][128] = 1; - g_pdc_trig_map[0][129] = 1; - g_pdc_trig_map[0][130] = 1; - g_pdc_trig_map[0][131] = 1; - g_pdc_trig_map[0][132] = 1; - g_pdc_trig_map[0][133] = 1; - g_pdc_trig_map[0][134] = 1; - g_pdc_trig_map[0][135] = 1; - g_pdc_trig_map[0][136] = 1; - g_pdc_trig_map[0][137] = 1; - g_pdc_trig_map[0][138] = 1; - g_pdc_trig_map[0][139] = 1; - g_pdc_trig_map[0][140] = 1; - g_pdc_trig_map[0][141] = 1; - g_pdc_trig_map[0][142] = 1; - g_pdc_trig_map[0][143] = 1; - g_pdc_trig_map[1][0] = 1; - g_pdc_trig_map[1][1] = 1; - g_pdc_trig_map[1][2] = 1; - g_pdc_trig_map[1][3] = 1; - g_pdc_trig_map[1][4] = 1; - g_pdc_trig_map[1][5] = 1; - g_pdc_trig_map[1][6] = 1; - g_pdc_trig_map[1][7] = 1; - g_pdc_trig_map[1][8] = 1; - g_pdc_trig_map[1][9] = 1; - g_pdc_trig_map[1][10] = 1; - g_pdc_trig_map[1][11] = 1; - g_pdc_trig_map[1][12] = 1; - g_pdc_trig_map[1][13] = 1; - g_pdc_trig_map[1][14] = 1; - g_pdc_trig_map[1][15] = 1; - g_pdc_trig_map[1][16] = 1; - g_pdc_trig_map[1][17] = 1; - g_pdc_trig_map[1][18] = 1; - g_pdc_trig_map[1][19] = 1; - g_pdc_trig_map[1][20] = 1; - g_pdc_trig_map[1][21] = 1; - g_pdc_trig_map[1][22] = 1; - g_pdc_trig_map[1][23] = 1; - g_pdc_trig_map[1][24] = 1; - g_pdc_trig_map[1][25] = 1; - g_pdc_trig_map[1][26] = 1; - g_pdc_trig_map[1][27] = 1; - g_pdc_trig_map[1][28] = 1; - g_pdc_trig_map[1][29] = 1; - g_pdc_trig_map[1][30] = 1; - g_pdc_trig_map[1][31] = 1; - g_pdc_trig_map[1][32] = 1; - g_pdc_trig_map[1][33] = 1; - g_pdc_trig_map[1][34] = 1; - g_pdc_trig_map[1][35] = 1; - g_pdc_trig_map[1][36] = 1; - g_pdc_trig_map[1][37] = 1; - g_pdc_trig_map[1][38] = 1; - g_pdc_trig_map[1][39] = 1; - g_pdc_trig_map[1][40] = 1; - g_pdc_trig_map[1][41] = 1; - g_pdc_trig_map[1][42] = 1; - g_pdc_trig_map[1][43] = 1; - g_pdc_trig_map[1][44] = 1; - g_pdc_trig_map[1][45] = 1; - g_pdc_trig_map[1][46] = 1; - g_pdc_trig_map[1][47] = 1; - g_pdc_trig_map[1][48] = 1; - g_pdc_trig_map[1][49] = 1; - g_pdc_trig_map[1][50] = 1; - g_pdc_trig_map[1][51] = 1; - g_pdc_trig_map[1][52] = 1; - g_pdc_trig_map[1][53] = 1; - g_pdc_trig_map[1][54] = 1; - g_pdc_trig_map[1][55] = 1; - g_pdc_trig_map[1][56] = 1; - g_pdc_trig_map[1][57] = 1; - g_pdc_trig_map[1][58] = 1; - g_pdc_trig_map[1][59] = 1; - g_pdc_trig_map[1][60] = 1; - g_pdc_trig_map[1][61] = 1; - g_pdc_trig_map[1][62] = 1; - g_pdc_trig_map[1][63] = 1; - g_pdc_trig_map[1][64] = 1; - g_pdc_trig_map[1][65] = 1; - g_pdc_trig_map[1][66] = 1; - g_pdc_trig_map[1][67] = 1; - g_pdc_trig_map[1][68] = 1; - g_pdc_trig_map[1][69] = 1; - g_pdc_trig_map[1][70] = 1; - g_pdc_trig_map[1][71] = 1; - g_pdc_trig_map[1][72] = 1; - g_pdc_trig_map[1][73] = 1; - g_pdc_trig_map[1][74] = 1; - g_pdc_trig_map[1][75] = 1; - g_pdc_trig_map[1][76] = 1; - g_pdc_trig_map[1][77] = 1; - g_pdc_trig_map[1][78] = 1; - g_pdc_trig_map[1][79] = 1; - g_pdc_trig_map[1][80] = 1; - g_pdc_trig_map[1][81] = 1; - g_pdc_trig_map[1][82] = 1; - g_pdc_trig_map[1][83] = 1; - g_pdc_trig_map[1][84] = 1; - g_pdc_trig_map[1][85] = 1; - g_pdc_trig_map[1][86] = 1; - g_pdc_trig_map[1][87] = 1; - g_pdc_trig_map[1][88] = 1; - g_pdc_trig_map[1][89] = 1; - g_pdc_trig_map[1][90] = 1; - g_pdc_trig_map[1][91] = 1; - g_pdc_trig_map[1][92] = 1; - g_pdc_trig_map[1][93] = 1; - g_pdc_trig_map[1][94] = 1; - g_pdc_trig_map[1][95] = 1; - g_pdc_trig_map[1][96] = 1; - g_pdc_trig_map[1][97] = 1; - g_pdc_trig_map[1][98] = 1; - g_pdc_trig_map[1][99] = 1; - g_pdc_trig_map[1][100] = 1; - g_pdc_trig_map[1][101] = 1; - g_pdc_trig_map[1][102] = 1; - g_pdc_trig_map[1][103] = 1; - g_pdc_trig_map[1][104] = 1; - g_pdc_trig_map[1][105] = 1; - g_pdc_trig_map[1][106] = 1; - g_pdc_trig_map[1][107] = 1; - g_pdc_trig_map[1][108] = 1; - g_pdc_trig_map[1][109] = 1; - g_pdc_trig_map[1][110] = 1; - g_pdc_trig_map[1][111] = 1; - g_pdc_trig_map[2][0] = 2; - g_pdc_trig_map[2][1] = 2; - g_pdc_trig_map[2][2] = 2; - g_pdc_trig_map[2][3] = 2; - g_pdc_trig_map[2][4] = 2; - g_pdc_trig_map[2][5] = 2; - g_pdc_trig_map[2][6] = 2; - g_pdc_trig_map[2][7] = 2; - g_pdc_trig_map[2][8] = 2; - g_pdc_trig_map[2][9] = 2; - g_pdc_trig_map[2][10] = 2; - g_pdc_trig_map[2][11] = 2; - g_pdc_trig_map[2][12] = 2; - g_pdc_trig_map[2][13] = 2; - g_pdc_trig_map[2][14] = 2; - g_pdc_trig_map[2][15] = 2; - g_pdc_trig_map[2][16] = 2; - g_pdc_trig_map[2][17] = 2; - g_pdc_trig_map[2][18] = 2; - g_pdc_trig_map[2][19] = 2; - g_pdc_trig_map[2][20] = 2; - g_pdc_trig_map[2][21] = 2; - g_pdc_trig_map[2][22] = 2; - g_pdc_trig_map[2][23] = 2; - g_pdc_trig_map[2][24] = 2; - g_pdc_trig_map[2][25] = 2; - g_pdc_trig_map[2][26] = 2; - g_pdc_trig_map[2][27] = 2; - g_pdc_trig_map[2][28] = 2; - g_pdc_trig_map[2][29] = 2; - g_pdc_trig_map[2][30] = 2; - g_pdc_trig_map[2][31] = 2; - g_pdc_trig_map[2][32] = 2; - g_pdc_trig_map[2][33] = 2; - g_pdc_trig_map[2][34] = 2; - g_pdc_trig_map[2][35] = 2; - g_pdc_trig_map[2][36] = 2; - g_pdc_trig_map[2][37] = 2; - g_pdc_trig_map[2][38] = 2; - g_pdc_trig_map[2][39] = 2; - g_pdc_trig_map[2][40] = 2; - g_pdc_trig_map[2][41] = 2; - g_pdc_trig_map[2][42] = 2; - g_pdc_trig_map[2][43] = 2; - g_pdc_trig_map[2][44] = 2; - g_pdc_trig_map[2][45] = 2; - g_pdc_trig_map[2][46] = 2; - g_pdc_trig_map[2][47] = 2; - g_pdc_trig_map[2][48] = 2; - g_pdc_trig_map[2][49] = 2; - g_pdc_trig_map[2][50] = 2; - g_pdc_trig_map[2][51] = 2; - g_pdc_trig_map[2][52] = 2; - g_pdc_trig_map[2][53] = 2; - g_pdc_trig_map[2][54] = 2; - g_pdc_trig_map[2][55] = 2; - g_pdc_trig_map[2][56] = 2; - g_pdc_trig_map[2][57] = 2; - g_pdc_trig_map[2][58] = 2; - g_pdc_trig_map[2][59] = 2; - g_pdc_trig_map[2][60] = 2; - g_pdc_trig_map[2][61] = 2; - g_pdc_trig_map[2][62] = 2; - g_pdc_trig_map[2][63] = 2; - g_pdc_trig_map[2][64] = 2; - g_pdc_trig_map[2][65] = 2; - g_pdc_trig_map[2][66] = 2; - g_pdc_trig_map[2][67] = 2; - g_pdc_trig_map[2][68] = 2; - g_pdc_trig_map[2][69] = 2; - g_pdc_trig_map[2][70] = 2; - g_pdc_trig_map[2][71] = 2; - g_pdc_trig_map[2][72] = 2; - g_pdc_trig_map[2][73] = 2; - g_pdc_trig_map[2][74] = 2; - g_pdc_trig_map[2][75] = 2; - g_pdc_trig_map[2][76] = 2; - g_pdc_trig_map[2][77] = 2; - g_pdc_trig_map[2][78] = 2; - g_pdc_trig_map[2][79] = 2; - g_pdc_trig_map[2][80] = 2; - g_pdc_trig_map[2][81] = 2; - g_pdc_trig_map[2][82] = 2; - g_pdc_trig_map[2][83] = 2; - g_pdc_trig_map[2][84] = 2; - g_pdc_trig_map[2][85] = 2; - g_pdc_trig_map[2][86] = 2; - g_pdc_trig_map[2][87] = 2; - g_pdc_trig_map[2][88] = 2; - g_pdc_trig_map[2][89] = 2; - g_pdc_trig_map[2][90] = 2; - g_pdc_trig_map[2][91] = 2; - g_pdc_trig_map[2][92] = 2; - g_pdc_trig_map[2][93] = 2; - g_pdc_trig_map[2][94] = 2; - g_pdc_trig_map[2][95] = 2; - g_pdc_trig_map[2][96] = 2; - g_pdc_trig_map[2][97] = 2; - g_pdc_trig_map[2][98] = 2; - g_pdc_trig_map[2][99] = 2; - g_pdc_trig_map[2][100] = 2; - g_pdc_trig_map[2][101] = 2; - g_pdc_trig_map[2][102] = 2; - g_pdc_trig_map[2][103] = 2; - g_pdc_trig_map[2][104] = 2; - g_pdc_trig_map[2][105] = 2; - g_pdc_trig_map[2][106] = 2; - g_pdc_trig_map[2][107] = 2; - g_pdc_trig_map[2][108] = 2; - g_pdc_trig_map[2][109] = 2; - g_pdc_trig_map[2][110] = 2; - g_pdc_trig_map[2][111] = 2; - g_pdc_trig_map[2][112] = 2; - g_pdc_trig_map[2][113] = 2; - g_pdc_trig_map[2][114] = 2; - g_pdc_trig_map[2][115] = 2; - g_pdc_trig_map[2][116] = 2; - g_pdc_trig_map[2][117] = 2; - g_pdc_trig_map[2][118] = 2; - g_pdc_trig_map[2][119] = 2; - g_pdc_trig_map[2][120] = 2; - g_pdc_trig_map[2][121] = 2; - g_pdc_trig_map[2][122] = 2; - g_pdc_trig_map[2][123] = 2; - g_pdc_trig_map[2][124] = 2; - g_pdc_trig_map[2][125] = 2; - g_pdc_trig_map[2][126] = 2; - g_pdc_trig_map[2][127] = 2; - g_pdc_trig_map[2][128] = 3; - g_pdc_trig_map[2][129] = 3; - g_pdc_trig_map[2][130] = 3; - g_pdc_trig_map[2][131] = 3; - g_pdc_trig_map[2][132] = 3; - g_pdc_trig_map[2][133] = 3; - g_pdc_trig_map[2][134] = 3; - g_pdc_trig_map[2][135] = 3; - g_pdc_trig_map[2][136] = 3; - g_pdc_trig_map[2][137] = 3; - g_pdc_trig_map[2][138] = 3; - g_pdc_trig_map[2][139] = 3; - g_pdc_trig_map[2][140] = 3; - g_pdc_trig_map[2][141] = 3; - g_pdc_trig_map[2][142] = 3; - g_pdc_trig_map[2][143] = 3; - g_pdc_trig_map[3][0] = 3; - g_pdc_trig_map[3][1] = 3; - g_pdc_trig_map[3][2] = 3; - g_pdc_trig_map[3][3] = 3; - g_pdc_trig_map[3][4] = 3; - g_pdc_trig_map[3][5] = 3; - g_pdc_trig_map[3][6] = 3; - g_pdc_trig_map[3][7] = 3; - g_pdc_trig_map[3][8] = 3; - g_pdc_trig_map[3][9] = 3; - g_pdc_trig_map[3][10] = 3; - g_pdc_trig_map[3][11] = 3; - g_pdc_trig_map[3][12] = 3; - g_pdc_trig_map[3][13] = 3; - g_pdc_trig_map[3][14] = 3; - g_pdc_trig_map[3][15] = 3; - g_pdc_trig_map[3][16] = 3; - g_pdc_trig_map[3][17] = 3; - g_pdc_trig_map[3][18] = 3; - g_pdc_trig_map[3][19] = 3; - g_pdc_trig_map[3][20] = 3; - g_pdc_trig_map[3][21] = 3; - g_pdc_trig_map[3][22] = 3; - g_pdc_trig_map[3][23] = 3; - g_pdc_trig_map[3][24] = 3; - g_pdc_trig_map[3][25] = 3; - g_pdc_trig_map[3][26] = 3; - g_pdc_trig_map[3][27] = 3; - g_pdc_trig_map[3][28] = 3; - g_pdc_trig_map[3][29] = 3; - g_pdc_trig_map[3][30] = 3; - g_pdc_trig_map[3][31] = 3; - g_pdc_trig_map[3][32] = 3; - g_pdc_trig_map[3][33] = 3; - g_pdc_trig_map[3][34] = 3; - g_pdc_trig_map[3][35] = 3; - g_pdc_trig_map[3][36] = 3; - g_pdc_trig_map[3][37] = 3; - g_pdc_trig_map[3][38] = 3; - g_pdc_trig_map[3][39] = 3; - g_pdc_trig_map[3][40] = 3; - g_pdc_trig_map[3][41] = 3; - g_pdc_trig_map[3][42] = 3; - g_pdc_trig_map[3][43] = 3; - g_pdc_trig_map[3][44] = 3; - g_pdc_trig_map[3][45] = 3; - g_pdc_trig_map[3][46] = 3; - g_pdc_trig_map[3][47] = 3; - g_pdc_trig_map[3][48] = 3; - g_pdc_trig_map[3][49] = 3; - g_pdc_trig_map[3][50] = 3; - g_pdc_trig_map[3][51] = 3; - g_pdc_trig_map[3][52] = 3; - g_pdc_trig_map[3][53] = 3; - g_pdc_trig_map[3][54] = 3; - g_pdc_trig_map[3][55] = 3; - g_pdc_trig_map[3][56] = 3; - g_pdc_trig_map[3][57] = 3; - g_pdc_trig_map[3][58] = 3; - g_pdc_trig_map[3][59] = 3; - g_pdc_trig_map[3][60] = 3; - g_pdc_trig_map[3][61] = 3; - g_pdc_trig_map[3][62] = 3; - g_pdc_trig_map[3][63] = 3; - g_pdc_trig_map[3][64] = 3; - g_pdc_trig_map[3][65] = 3; - g_pdc_trig_map[3][66] = 3; - g_pdc_trig_map[3][67] = 3; - g_pdc_trig_map[3][68] = 3; - g_pdc_trig_map[3][69] = 3; - g_pdc_trig_map[3][70] = 3; - g_pdc_trig_map[3][71] = 3; - g_pdc_trig_map[3][72] = 3; - g_pdc_trig_map[3][73] = 3; - g_pdc_trig_map[3][74] = 3; - g_pdc_trig_map[3][75] = 3; - g_pdc_trig_map[3][76] = 3; - g_pdc_trig_map[3][77] = 3; - g_pdc_trig_map[3][78] = 3; - g_pdc_trig_map[3][79] = 3; - g_pdc_trig_map[3][80] = 3; - g_pdc_trig_map[3][81] = 3; - g_pdc_trig_map[3][82] = 3; - g_pdc_trig_map[3][83] = 3; - g_pdc_trig_map[3][84] = 3; - g_pdc_trig_map[3][85] = 3; - g_pdc_trig_map[3][86] = 3; - g_pdc_trig_map[3][87] = 3; - g_pdc_trig_map[3][88] = 3; - g_pdc_trig_map[3][89] = 3; - g_pdc_trig_map[3][90] = 3; - g_pdc_trig_map[3][91] = 3; - g_pdc_trig_map[3][92] = 3; - g_pdc_trig_map[3][93] = 3; - g_pdc_trig_map[3][94] = 3; - g_pdc_trig_map[3][95] = 3; - g_pdc_trig_map[3][96] = 3; - g_pdc_trig_map[3][97] = 3; - g_pdc_trig_map[3][98] = 3; - g_pdc_trig_map[3][99] = 3; - g_pdc_trig_map[3][100] = 3; - g_pdc_trig_map[3][101] = 3; - g_pdc_trig_map[3][102] = 3; - g_pdc_trig_map[3][103] = 3; - g_pdc_trig_map[3][104] = 3; - g_pdc_trig_map[3][105] = 3; - g_pdc_trig_map[3][106] = 3; - g_pdc_trig_map[3][107] = 3; - g_pdc_trig_map[3][108] = 3; - g_pdc_trig_map[3][109] = 3; - g_pdc_trig_map[3][110] = 3; - g_pdc_trig_map[3][111] = 3; +unsigned g_pdc_trig_map[4][144] = { { 0 } }; +void pdc_trig_map_setup() +{ + g_pdc_trig_map[0][0] = 0; + g_pdc_trig_map[0][1] = 0; + g_pdc_trig_map[0][2] = 0; + g_pdc_trig_map[0][3] = 0; + g_pdc_trig_map[0][4] = 0; + g_pdc_trig_map[0][5] = 0; + g_pdc_trig_map[0][6] = 0; + g_pdc_trig_map[0][7] = 0; + g_pdc_trig_map[0][8] = 0; + g_pdc_trig_map[0][9] = 0; + g_pdc_trig_map[0][10] = 0; + g_pdc_trig_map[0][11] = 0; + g_pdc_trig_map[0][12] = 0; + g_pdc_trig_map[0][13] = 0; + g_pdc_trig_map[0][14] = 0; + g_pdc_trig_map[0][15] = 0; + g_pdc_trig_map[0][16] = 0; + g_pdc_trig_map[0][17] = 0; + g_pdc_trig_map[0][18] = 0; + g_pdc_trig_map[0][19] = 0; + g_pdc_trig_map[0][20] = 0; + g_pdc_trig_map[0][21] = 0; + g_pdc_trig_map[0][22] = 0; + g_pdc_trig_map[0][23] = 0; + g_pdc_trig_map[0][24] = 0; + g_pdc_trig_map[0][25] = 0; + g_pdc_trig_map[0][26] = 0; + g_pdc_trig_map[0][27] = 0; + g_pdc_trig_map[0][28] = 0; + g_pdc_trig_map[0][29] = 0; + g_pdc_trig_map[0][30] = 0; + g_pdc_trig_map[0][31] = 0; + g_pdc_trig_map[0][32] = 0; + g_pdc_trig_map[0][33] = 0; + g_pdc_trig_map[0][34] = 0; + g_pdc_trig_map[0][35] = 0; + g_pdc_trig_map[0][36] = 0; + g_pdc_trig_map[0][37] = 0; + g_pdc_trig_map[0][38] = 0; + g_pdc_trig_map[0][39] = 0; + g_pdc_trig_map[0][40] = 0; + g_pdc_trig_map[0][41] = 0; + g_pdc_trig_map[0][42] = 0; + g_pdc_trig_map[0][43] = 0; + g_pdc_trig_map[0][44] = 0; + g_pdc_trig_map[0][45] = 0; + g_pdc_trig_map[0][46] = 0; + g_pdc_trig_map[0][47] = 0; + g_pdc_trig_map[0][48] = 0; + g_pdc_trig_map[0][49] = 0; + g_pdc_trig_map[0][50] = 0; + g_pdc_trig_map[0][51] = 0; + g_pdc_trig_map[0][52] = 0; + g_pdc_trig_map[0][53] = 0; + g_pdc_trig_map[0][54] = 0; + g_pdc_trig_map[0][55] = 0; + g_pdc_trig_map[0][56] = 0; + g_pdc_trig_map[0][57] = 0; + g_pdc_trig_map[0][58] = 0; + g_pdc_trig_map[0][59] = 0; + g_pdc_trig_map[0][60] = 0; + g_pdc_trig_map[0][61] = 0; + g_pdc_trig_map[0][62] = 0; + g_pdc_trig_map[0][63] = 0; + g_pdc_trig_map[0][64] = 0; + g_pdc_trig_map[0][65] = 0; + g_pdc_trig_map[0][66] = 0; + g_pdc_trig_map[0][67] = 0; + g_pdc_trig_map[0][68] = 0; + g_pdc_trig_map[0][69] = 0; + g_pdc_trig_map[0][70] = 0; + g_pdc_trig_map[0][71] = 0; + g_pdc_trig_map[0][72] = 0; + g_pdc_trig_map[0][73] = 0; + g_pdc_trig_map[0][74] = 0; + g_pdc_trig_map[0][75] = 0; + g_pdc_trig_map[0][76] = 0; + g_pdc_trig_map[0][77] = 0; + g_pdc_trig_map[0][78] = 0; + g_pdc_trig_map[0][79] = 0; + g_pdc_trig_map[0][80] = 0; + g_pdc_trig_map[0][81] = 0; + g_pdc_trig_map[0][82] = 0; + g_pdc_trig_map[0][83] = 0; + g_pdc_trig_map[0][84] = 0; + g_pdc_trig_map[0][85] = 0; + g_pdc_trig_map[0][86] = 0; + g_pdc_trig_map[0][87] = 0; + g_pdc_trig_map[0][88] = 0; + g_pdc_trig_map[0][89] = 0; + g_pdc_trig_map[0][90] = 0; + g_pdc_trig_map[0][91] = 0; + g_pdc_trig_map[0][92] = 0; + g_pdc_trig_map[0][93] = 0; + g_pdc_trig_map[0][94] = 0; + g_pdc_trig_map[0][95] = 0; + g_pdc_trig_map[0][96] = 0; + g_pdc_trig_map[0][97] = 0; + g_pdc_trig_map[0][98] = 0; + g_pdc_trig_map[0][99] = 0; + g_pdc_trig_map[0][100] = 0; + g_pdc_trig_map[0][101] = 0; + g_pdc_trig_map[0][102] = 0; + g_pdc_trig_map[0][103] = 0; + g_pdc_trig_map[0][104] = 0; + g_pdc_trig_map[0][105] = 0; + g_pdc_trig_map[0][106] = 0; + g_pdc_trig_map[0][107] = 0; + g_pdc_trig_map[0][108] = 0; + g_pdc_trig_map[0][109] = 0; + g_pdc_trig_map[0][110] = 0; + g_pdc_trig_map[0][111] = 0; + g_pdc_trig_map[0][112] = 0; + g_pdc_trig_map[0][113] = 0; + g_pdc_trig_map[0][114] = 0; + g_pdc_trig_map[0][115] = 0; + g_pdc_trig_map[0][116] = 0; + g_pdc_trig_map[0][117] = 0; + g_pdc_trig_map[0][118] = 0; + g_pdc_trig_map[0][119] = 0; + g_pdc_trig_map[0][120] = 0; + g_pdc_trig_map[0][121] = 0; + g_pdc_trig_map[0][122] = 0; + g_pdc_trig_map[0][123] = 0; + g_pdc_trig_map[0][124] = 0; + g_pdc_trig_map[0][125] = 0; + g_pdc_trig_map[0][126] = 0; + g_pdc_trig_map[0][127] = 0; + g_pdc_trig_map[0][128] = 1; + g_pdc_trig_map[0][129] = 1; + g_pdc_trig_map[0][130] = 1; + g_pdc_trig_map[0][131] = 1; + g_pdc_trig_map[0][132] = 1; + g_pdc_trig_map[0][133] = 1; + g_pdc_trig_map[0][134] = 1; + g_pdc_trig_map[0][135] = 1; + g_pdc_trig_map[0][136] = 1; + g_pdc_trig_map[0][137] = 1; + g_pdc_trig_map[0][138] = 1; + g_pdc_trig_map[0][139] = 1; + g_pdc_trig_map[0][140] = 1; + g_pdc_trig_map[0][141] = 1; + g_pdc_trig_map[0][142] = 1; + g_pdc_trig_map[0][143] = 1; + g_pdc_trig_map[1][0] = 1; + g_pdc_trig_map[1][1] = 1; + g_pdc_trig_map[1][2] = 1; + g_pdc_trig_map[1][3] = 1; + g_pdc_trig_map[1][4] = 1; + g_pdc_trig_map[1][5] = 1; + g_pdc_trig_map[1][6] = 1; + g_pdc_trig_map[1][7] = 1; + g_pdc_trig_map[1][8] = 1; + g_pdc_trig_map[1][9] = 1; + g_pdc_trig_map[1][10] = 1; + g_pdc_trig_map[1][11] = 1; + g_pdc_trig_map[1][12] = 1; + g_pdc_trig_map[1][13] = 1; + g_pdc_trig_map[1][14] = 1; + g_pdc_trig_map[1][15] = 1; + g_pdc_trig_map[1][16] = 1; + g_pdc_trig_map[1][17] = 1; + g_pdc_trig_map[1][18] = 1; + g_pdc_trig_map[1][19] = 1; + g_pdc_trig_map[1][20] = 1; + g_pdc_trig_map[1][21] = 1; + g_pdc_trig_map[1][22] = 1; + g_pdc_trig_map[1][23] = 1; + g_pdc_trig_map[1][24] = 1; + g_pdc_trig_map[1][25] = 1; + g_pdc_trig_map[1][26] = 1; + g_pdc_trig_map[1][27] = 1; + g_pdc_trig_map[1][28] = 1; + g_pdc_trig_map[1][29] = 1; + g_pdc_trig_map[1][30] = 1; + g_pdc_trig_map[1][31] = 1; + g_pdc_trig_map[1][32] = 1; + g_pdc_trig_map[1][33] = 1; + g_pdc_trig_map[1][34] = 1; + g_pdc_trig_map[1][35] = 1; + g_pdc_trig_map[1][36] = 1; + g_pdc_trig_map[1][37] = 1; + g_pdc_trig_map[1][38] = 1; + g_pdc_trig_map[1][39] = 1; + g_pdc_trig_map[1][40] = 1; + g_pdc_trig_map[1][41] = 1; + g_pdc_trig_map[1][42] = 1; + g_pdc_trig_map[1][43] = 1; + g_pdc_trig_map[1][44] = 1; + g_pdc_trig_map[1][45] = 1; + g_pdc_trig_map[1][46] = 1; + g_pdc_trig_map[1][47] = 1; + g_pdc_trig_map[1][48] = 1; + g_pdc_trig_map[1][49] = 1; + g_pdc_trig_map[1][50] = 1; + g_pdc_trig_map[1][51] = 1; + g_pdc_trig_map[1][52] = 1; + g_pdc_trig_map[1][53] = 1; + g_pdc_trig_map[1][54] = 1; + g_pdc_trig_map[1][55] = 1; + g_pdc_trig_map[1][56] = 1; + g_pdc_trig_map[1][57] = 1; + g_pdc_trig_map[1][58] = 1; + g_pdc_trig_map[1][59] = 1; + g_pdc_trig_map[1][60] = 1; + g_pdc_trig_map[1][61] = 1; + g_pdc_trig_map[1][62] = 1; + g_pdc_trig_map[1][63] = 1; + g_pdc_trig_map[1][64] = 1; + g_pdc_trig_map[1][65] = 1; + g_pdc_trig_map[1][66] = 1; + g_pdc_trig_map[1][67] = 1; + g_pdc_trig_map[1][68] = 1; + g_pdc_trig_map[1][69] = 1; + g_pdc_trig_map[1][70] = 1; + g_pdc_trig_map[1][71] = 1; + g_pdc_trig_map[1][72] = 1; + g_pdc_trig_map[1][73] = 1; + g_pdc_trig_map[1][74] = 1; + g_pdc_trig_map[1][75] = 1; + g_pdc_trig_map[1][76] = 1; + g_pdc_trig_map[1][77] = 1; + g_pdc_trig_map[1][78] = 1; + g_pdc_trig_map[1][79] = 1; + g_pdc_trig_map[1][80] = 1; + g_pdc_trig_map[1][81] = 1; + g_pdc_trig_map[1][82] = 1; + g_pdc_trig_map[1][83] = 1; + g_pdc_trig_map[1][84] = 1; + g_pdc_trig_map[1][85] = 1; + g_pdc_trig_map[1][86] = 1; + g_pdc_trig_map[1][87] = 1; + g_pdc_trig_map[1][88] = 1; + g_pdc_trig_map[1][89] = 1; + g_pdc_trig_map[1][90] = 1; + g_pdc_trig_map[1][91] = 1; + g_pdc_trig_map[1][92] = 1; + g_pdc_trig_map[1][93] = 1; + g_pdc_trig_map[1][94] = 1; + g_pdc_trig_map[1][95] = 1; + g_pdc_trig_map[1][96] = 1; + g_pdc_trig_map[1][97] = 1; + g_pdc_trig_map[1][98] = 1; + g_pdc_trig_map[1][99] = 1; + g_pdc_trig_map[1][100] = 1; + g_pdc_trig_map[1][101] = 1; + g_pdc_trig_map[1][102] = 1; + g_pdc_trig_map[1][103] = 1; + g_pdc_trig_map[1][104] = 1; + g_pdc_trig_map[1][105] = 1; + g_pdc_trig_map[1][106] = 1; + g_pdc_trig_map[1][107] = 1; + g_pdc_trig_map[1][108] = 1; + g_pdc_trig_map[1][109] = 1; + g_pdc_trig_map[1][110] = 1; + g_pdc_trig_map[1][111] = 1; + g_pdc_trig_map[2][0] = 2; + g_pdc_trig_map[2][1] = 2; + g_pdc_trig_map[2][2] = 2; + g_pdc_trig_map[2][3] = 2; + g_pdc_trig_map[2][4] = 2; + g_pdc_trig_map[2][5] = 2; + g_pdc_trig_map[2][6] = 2; + g_pdc_trig_map[2][7] = 2; + g_pdc_trig_map[2][8] = 2; + g_pdc_trig_map[2][9] = 2; + g_pdc_trig_map[2][10] = 2; + g_pdc_trig_map[2][11] = 2; + g_pdc_trig_map[2][12] = 2; + g_pdc_trig_map[2][13] = 2; + g_pdc_trig_map[2][14] = 2; + g_pdc_trig_map[2][15] = 2; + g_pdc_trig_map[2][16] = 2; + g_pdc_trig_map[2][17] = 2; + g_pdc_trig_map[2][18] = 2; + g_pdc_trig_map[2][19] = 2; + g_pdc_trig_map[2][20] = 2; + g_pdc_trig_map[2][21] = 2; + g_pdc_trig_map[2][22] = 2; + g_pdc_trig_map[2][23] = 2; + g_pdc_trig_map[2][24] = 2; + g_pdc_trig_map[2][25] = 2; + g_pdc_trig_map[2][26] = 2; + g_pdc_trig_map[2][27] = 2; + g_pdc_trig_map[2][28] = 2; + g_pdc_trig_map[2][29] = 2; + g_pdc_trig_map[2][30] = 2; + g_pdc_trig_map[2][31] = 2; + g_pdc_trig_map[2][32] = 2; + g_pdc_trig_map[2][33] = 2; + g_pdc_trig_map[2][34] = 2; + g_pdc_trig_map[2][35] = 2; + g_pdc_trig_map[2][36] = 2; + g_pdc_trig_map[2][37] = 2; + g_pdc_trig_map[2][38] = 2; + g_pdc_trig_map[2][39] = 2; + g_pdc_trig_map[2][40] = 2; + g_pdc_trig_map[2][41] = 2; + g_pdc_trig_map[2][42] = 2; + g_pdc_trig_map[2][43] = 2; + g_pdc_trig_map[2][44] = 2; + g_pdc_trig_map[2][45] = 2; + g_pdc_trig_map[2][46] = 2; + g_pdc_trig_map[2][47] = 2; + g_pdc_trig_map[2][48] = 2; + g_pdc_trig_map[2][49] = 2; + g_pdc_trig_map[2][50] = 2; + g_pdc_trig_map[2][51] = 2; + g_pdc_trig_map[2][52] = 2; + g_pdc_trig_map[2][53] = 2; + g_pdc_trig_map[2][54] = 2; + g_pdc_trig_map[2][55] = 2; + g_pdc_trig_map[2][56] = 2; + g_pdc_trig_map[2][57] = 2; + g_pdc_trig_map[2][58] = 2; + g_pdc_trig_map[2][59] = 2; + g_pdc_trig_map[2][60] = 2; + g_pdc_trig_map[2][61] = 2; + g_pdc_trig_map[2][62] = 2; + g_pdc_trig_map[2][63] = 2; + g_pdc_trig_map[2][64] = 2; + g_pdc_trig_map[2][65] = 2; + g_pdc_trig_map[2][66] = 2; + g_pdc_trig_map[2][67] = 2; + g_pdc_trig_map[2][68] = 2; + g_pdc_trig_map[2][69] = 2; + g_pdc_trig_map[2][70] = 2; + g_pdc_trig_map[2][71] = 2; + g_pdc_trig_map[2][72] = 2; + g_pdc_trig_map[2][73] = 2; + g_pdc_trig_map[2][74] = 2; + g_pdc_trig_map[2][75] = 2; + g_pdc_trig_map[2][76] = 2; + g_pdc_trig_map[2][77] = 2; + g_pdc_trig_map[2][78] = 2; + g_pdc_trig_map[2][79] = 2; + g_pdc_trig_map[2][80] = 2; + g_pdc_trig_map[2][81] = 2; + g_pdc_trig_map[2][82] = 2; + g_pdc_trig_map[2][83] = 2; + g_pdc_trig_map[2][84] = 2; + g_pdc_trig_map[2][85] = 2; + g_pdc_trig_map[2][86] = 2; + g_pdc_trig_map[2][87] = 2; + g_pdc_trig_map[2][88] = 2; + g_pdc_trig_map[2][89] = 2; + g_pdc_trig_map[2][90] = 2; + g_pdc_trig_map[2][91] = 2; + g_pdc_trig_map[2][92] = 2; + g_pdc_trig_map[2][93] = 2; + g_pdc_trig_map[2][94] = 2; + g_pdc_trig_map[2][95] = 2; + g_pdc_trig_map[2][96] = 2; + g_pdc_trig_map[2][97] = 2; + g_pdc_trig_map[2][98] = 2; + g_pdc_trig_map[2][99] = 2; + g_pdc_trig_map[2][100] = 2; + g_pdc_trig_map[2][101] = 2; + g_pdc_trig_map[2][102] = 2; + g_pdc_trig_map[2][103] = 2; + g_pdc_trig_map[2][104] = 2; + g_pdc_trig_map[2][105] = 2; + g_pdc_trig_map[2][106] = 2; + g_pdc_trig_map[2][107] = 2; + g_pdc_trig_map[2][108] = 2; + g_pdc_trig_map[2][109] = 2; + g_pdc_trig_map[2][110] = 2; + g_pdc_trig_map[2][111] = 2; + g_pdc_trig_map[2][112] = 2; + g_pdc_trig_map[2][113] = 2; + g_pdc_trig_map[2][114] = 2; + g_pdc_trig_map[2][115] = 2; + g_pdc_trig_map[2][116] = 2; + g_pdc_trig_map[2][117] = 2; + g_pdc_trig_map[2][118] = 2; + g_pdc_trig_map[2][119] = 2; + g_pdc_trig_map[2][120] = 2; + g_pdc_trig_map[2][121] = 2; + g_pdc_trig_map[2][122] = 2; + g_pdc_trig_map[2][123] = 2; + g_pdc_trig_map[2][124] = 2; + g_pdc_trig_map[2][125] = 2; + g_pdc_trig_map[2][126] = 2; + g_pdc_trig_map[2][127] = 2; + g_pdc_trig_map[2][128] = 3; + g_pdc_trig_map[2][129] = 3; + g_pdc_trig_map[2][130] = 3; + g_pdc_trig_map[2][131] = 3; + g_pdc_trig_map[2][132] = 3; + g_pdc_trig_map[2][133] = 3; + g_pdc_trig_map[2][134] = 3; + g_pdc_trig_map[2][135] = 3; + g_pdc_trig_map[2][136] = 3; + g_pdc_trig_map[2][137] = 3; + g_pdc_trig_map[2][138] = 3; + g_pdc_trig_map[2][139] = 3; + g_pdc_trig_map[2][140] = 3; + g_pdc_trig_map[2][141] = 3; + g_pdc_trig_map[2][142] = 3; + g_pdc_trig_map[2][143] = 3; + g_pdc_trig_map[3][0] = 3; + g_pdc_trig_map[3][1] = 3; + g_pdc_trig_map[3][2] = 3; + g_pdc_trig_map[3][3] = 3; + g_pdc_trig_map[3][4] = 3; + g_pdc_trig_map[3][5] = 3; + g_pdc_trig_map[3][6] = 3; + g_pdc_trig_map[3][7] = 3; + g_pdc_trig_map[3][8] = 3; + g_pdc_trig_map[3][9] = 3; + g_pdc_trig_map[3][10] = 3; + g_pdc_trig_map[3][11] = 3; + g_pdc_trig_map[3][12] = 3; + g_pdc_trig_map[3][13] = 3; + g_pdc_trig_map[3][14] = 3; + g_pdc_trig_map[3][15] = 3; + g_pdc_trig_map[3][16] = 3; + g_pdc_trig_map[3][17] = 3; + g_pdc_trig_map[3][18] = 3; + g_pdc_trig_map[3][19] = 3; + g_pdc_trig_map[3][20] = 3; + g_pdc_trig_map[3][21] = 3; + g_pdc_trig_map[3][22] = 3; + g_pdc_trig_map[3][23] = 3; + g_pdc_trig_map[3][24] = 3; + g_pdc_trig_map[3][25] = 3; + g_pdc_trig_map[3][26] = 3; + g_pdc_trig_map[3][27] = 3; + g_pdc_trig_map[3][28] = 3; + g_pdc_trig_map[3][29] = 3; + g_pdc_trig_map[3][30] = 3; + g_pdc_trig_map[3][31] = 3; + g_pdc_trig_map[3][32] = 3; + g_pdc_trig_map[3][33] = 3; + g_pdc_trig_map[3][34] = 3; + g_pdc_trig_map[3][35] = 3; + g_pdc_trig_map[3][36] = 3; + g_pdc_trig_map[3][37] = 3; + g_pdc_trig_map[3][38] = 3; + g_pdc_trig_map[3][39] = 3; + g_pdc_trig_map[3][40] = 3; + g_pdc_trig_map[3][41] = 3; + g_pdc_trig_map[3][42] = 3; + g_pdc_trig_map[3][43] = 3; + g_pdc_trig_map[3][44] = 3; + g_pdc_trig_map[3][45] = 3; + g_pdc_trig_map[3][46] = 3; + g_pdc_trig_map[3][47] = 3; + g_pdc_trig_map[3][48] = 3; + g_pdc_trig_map[3][49] = 3; + g_pdc_trig_map[3][50] = 3; + g_pdc_trig_map[3][51] = 3; + g_pdc_trig_map[3][52] = 3; + g_pdc_trig_map[3][53] = 3; + g_pdc_trig_map[3][54] = 3; + g_pdc_trig_map[3][55] = 3; + g_pdc_trig_map[3][56] = 3; + g_pdc_trig_map[3][57] = 3; + g_pdc_trig_map[3][58] = 3; + g_pdc_trig_map[3][59] = 3; + g_pdc_trig_map[3][60] = 3; + g_pdc_trig_map[3][61] = 3; + g_pdc_trig_map[3][62] = 3; + g_pdc_trig_map[3][63] = 3; + g_pdc_trig_map[3][64] = 3; + g_pdc_trig_map[3][65] = 3; + g_pdc_trig_map[3][66] = 3; + g_pdc_trig_map[3][67] = 3; + g_pdc_trig_map[3][68] = 3; + g_pdc_trig_map[3][69] = 3; + g_pdc_trig_map[3][70] = 3; + g_pdc_trig_map[3][71] = 3; + g_pdc_trig_map[3][72] = 3; + g_pdc_trig_map[3][73] = 3; + g_pdc_trig_map[3][74] = 3; + g_pdc_trig_map[3][75] = 3; + g_pdc_trig_map[3][76] = 3; + g_pdc_trig_map[3][77] = 3; + g_pdc_trig_map[3][78] = 3; + g_pdc_trig_map[3][79] = 3; + g_pdc_trig_map[3][80] = 3; + g_pdc_trig_map[3][81] = 3; + g_pdc_trig_map[3][82] = 3; + g_pdc_trig_map[3][83] = 3; + g_pdc_trig_map[3][84] = 3; + g_pdc_trig_map[3][85] = 3; + g_pdc_trig_map[3][86] = 3; + g_pdc_trig_map[3][87] = 3; + g_pdc_trig_map[3][88] = 3; + g_pdc_trig_map[3][89] = 3; + g_pdc_trig_map[3][90] = 3; + g_pdc_trig_map[3][91] = 3; + g_pdc_trig_map[3][92] = 3; + g_pdc_trig_map[3][93] = 3; + g_pdc_trig_map[3][94] = 3; + g_pdc_trig_map[3][95] = 3; + g_pdc_trig_map[3][96] = 3; + g_pdc_trig_map[3][97] = 3; + g_pdc_trig_map[3][98] = 3; + g_pdc_trig_map[3][99] = 3; + g_pdc_trig_map[3][100] = 3; + g_pdc_trig_map[3][101] = 3; + g_pdc_trig_map[3][102] = 3; + g_pdc_trig_map[3][103] = 3; + g_pdc_trig_map[3][104] = 3; + g_pdc_trig_map[3][105] = 3; + g_pdc_trig_map[3][106] = 3; + g_pdc_trig_map[3][107] = 3; + g_pdc_trig_map[3][108] = 3; + g_pdc_trig_map[3][109] = 3; + g_pdc_trig_map[3][110] = 3; + g_pdc_trig_map[3][111] = 3; } diff --git a/psp/R3BPspxCal2Hit.cxx b/psp/R3BPspxCal2Hit.cxx index adc7bd3a8..6062e2f8d 100644 --- a/psp/R3BPspxCal2Hit.cxx +++ b/psp/R3BPspxCal2Hit.cxx @@ -129,7 +129,8 @@ InitStatus R3BPspxCal2Hit::Init() for (Int_t f = 0; f < 2; f++) { - tmp[f] = dynamic_cast(fMan->GetObject(Form("Pspx%d_%cCal", d + 1, xy[f]))); // = branch name in TTree + tmp[f] = dynamic_cast( + fMan->GetObject(Form("Pspx%d_%cCal", d + 1, xy[f]))); // = branch name in TTree } if (tmp[0] == NULL && tmp[1] == NULL) { diff --git a/psp/R3BPspxMapped2Precal.cxx b/psp/R3BPspxMapped2Precal.cxx index 545c0bd54..9cbb00632 100644 --- a/psp/R3BPspxMapped2Precal.cxx +++ b/psp/R3BPspxMapped2Precal.cxx @@ -123,7 +123,8 @@ InitStatus R3BPspxMapped2Precal::Init() for (Int_t f = 0; f < 2; f++) { - tmp[f] = dynamic_cast(fMan->GetObject(Form("Pspx%d_%cMapped", d + 1, xy[f]))); // = branch name in TTree + tmp[f] = dynamic_cast( + fMan->GetObject(Form("Pspx%d_%cMapped", d + 1, xy[f]))); // = branch name in TTree } if (tmp[0] == NULL && tmp[1] == NULL) { diff --git a/psp/R3BPspxOnlineSpectra.cxx b/psp/R3BPspxOnlineSpectra.cxx index 59dc16599..cf540b552 100644 --- a/psp/R3BPspxOnlineSpectra.cxx +++ b/psp/R3BPspxOnlineSpectra.cxx @@ -105,8 +105,10 @@ InitStatus R3BPspxOnlineSpectra::Init() { for (Int_t f = 0; f < 2; f++) { - fMappedItemsPspx.push_back(dynamic_cast(mgr->GetObject(Form("Pspx%d_%cMapped", d + 1, c_xy[f])))); - fPrecalItemsPspx.push_back(dynamic_cast(mgr->GetObject(Form("Pspx%d_%cPrecal", d + 1, c_xy[f])))); + fMappedItemsPspx.push_back( + dynamic_cast(mgr->GetObject(Form("Pspx%d_%cMapped", d + 1, c_xy[f])))); + fPrecalItemsPspx.push_back( + dynamic_cast(mgr->GetObject(Form("Pspx%d_%cPrecal", d + 1, c_xy[f])))); fCalItemsPspx.push_back(dynamic_cast(mgr->GetObject(Form("Pspx%d_%cCal", d + 1, c_xy[f])))); fHitItemsPspx.push_back(dynamic_cast(mgr->GetObject(Form("Pspx%d_%cHit", d + 1, c_xy[f])))); } diff --git a/psp/R3BPspxPrecal2Cal.cxx b/psp/R3BPspxPrecal2Cal.cxx index 7148c77b5..2f6447b03 100644 --- a/psp/R3BPspxPrecal2Cal.cxx +++ b/psp/R3BPspxPrecal2Cal.cxx @@ -114,7 +114,8 @@ InitStatus R3BPspxPrecal2Cal::Init() for (Int_t f = 0; f < 2; f++) { - tmp[f] = dynamic_cast(fMan->GetObject(Form("Pspx%d_%cPrecal", d + 1, xy[f]))); // = branch name in TTree + tmp[f] = dynamic_cast( + fMan->GetObject(Form("Pspx%d_%cPrecal", d + 1, xy[f]))); // = branch name in TTree } if (tmp[0] == NULL && tmp[1] == NULL) { diff --git a/r3bgen/test/testR3BPhaseSpaceGeneratorIntegration.C b/r3bgen/test/testR3BPhaseSpaceGeneratorIntegration.C index a9ebd9b7e..f8cb07985 100644 --- a/r3bgen/test/testR3BPhaseSpaceGeneratorIntegration.C +++ b/r3bgen/test/testR3BPhaseSpaceGeneratorIntegration.C @@ -14,15 +14,15 @@ #include #include #include -#include #include +#include void testR3BPhaseSpaceGeneratorIntegration() { // Timer TStopwatch timer; timer.Start(); - + // Logging auto logger = FairLogger::GetLogger(); logger->SetLogVerbosityLevel("low"); diff --git a/r3bsource/beammonitor/R3BBeamMonitorReader.h b/r3bsource/beammonitor/R3BBeamMonitorReader.h index ebebd9a04..f3f4efe68 100644 --- a/r3bsource/beammonitor/R3BBeamMonitorReader.h +++ b/r3bsource/beammonitor/R3BBeamMonitorReader.h @@ -14,9 +14,9 @@ #ifndef R3BBEAMMONITORREADER_H #define R3BBEAMMONITORREADER_H 1 -#include #include "FairTask.h" #include "R3BReader.h" +#include struct EXT_STR_h101_BMON_t; typedef struct EXT_STR_h101_BMON_t EXT_STR_h101_BMON; diff --git a/rpc/calibration/R3BRpcCal2Hit.cxx b/rpc/calibration/R3BRpcCal2Hit.cxx index f49916753..a1e3fb80d 100644 --- a/rpc/calibration/R3BRpcCal2Hit.cxx +++ b/rpc/calibration/R3BRpcCal2Hit.cxx @@ -23,8 +23,8 @@ #include "FairRunAna.h" #include "FairRuntimeDb.h" -#include "R3BEventHeader.h" #include "R3BCoarseTimeStitch.h" +#include "R3BEventHeader.h" #include "TGeoManager.h" #include "TGeoMatrix.h" diff --git a/sfib/R3BSfibCal2Hit.h b/sfib/R3BSfibCal2Hit.h index b0dad13ef..b4ddedcc4 100644 --- a/sfib/R3BSfibCal2Hit.h +++ b/sfib/R3BSfibCal2Hit.h @@ -14,8 +14,8 @@ #ifndef R3BSFIBCAL2HIT #define R3BSFIBCAL2HIT -#include #include "FairTask.h" +#include #include diff --git a/sfib/R3BSfibMapped2Cal.h b/sfib/R3BSfibMapped2Cal.h index ed756253f..048d2af9a 100644 --- a/sfib/R3BSfibMapped2Cal.h +++ b/sfib/R3BSfibMapped2Cal.h @@ -20,9 +20,9 @@ #ifndef R3BSFIBMAPPED2CAL #define R3BSFIBMAPPED2CAL -#include #include "FairTask.h" #include +#include class R3BTCalPar; diff --git a/sfib/sim/R3Bsfi.cxx b/sfib/sim/R3Bsfi.cxx index dbd1a16fb..0567a09cc 100644 --- a/sfib/sim/R3Bsfi.cxx +++ b/sfib/sim/R3Bsfi.cxx @@ -21,7 +21,7 @@ #include "FairRuntimeDb.h" #include "FairVolume.h" #include "R3BFi4Point.h" -//#include "R3BGeosfi.h" +// #include "R3BGeosfi.h" #include "R3BMCStack.h" #include "TClonesArray.h" #include "TGeoArb8.h" diff --git a/tof/R3BTofContFact.cxx b/tof/R3BTofContFact.cxx index 8bf6794f9..b7e3c10a8 100644 --- a/tof/R3BTofContFact.cxx +++ b/tof/R3BTofContFact.cxx @@ -24,14 +24,14 @@ #include "R3BTofContFact.h" -//#include "R3BTofParRootFileIo.h" -//#include "R3BTofParAsciiFileIo.h" +// #include "R3BTofParRootFileIo.h" +// #include "R3BTofParAsciiFileIo.h" #include "R3BGeoTofPar.h" -//#include "R3BTofDigiPar.h" +// #include "R3BTofDigiPar.h" #include "R3BTofdHitPar.h" #include "FairRuntimeDb.h" -//#include "CbmParTest.h" +// #include "CbmParTest.h" #include "FairParAsciiFileIo.h" #include "FairParRootFileIo.h" diff --git a/tof/R3BTofdCal2HistoPar.cxx b/tof/R3BTofdCal2HistoPar.cxx index bb5e18f8f..460392d37 100644 --- a/tof/R3BTofdCal2HistoPar.cxx +++ b/tof/R3BTofdCal2HistoPar.cxx @@ -211,10 +211,11 @@ void R3BTofdCal2HistoPar::FinishTask() { LOG(warn) << "Calling Plane " << i + 1 << " Bar " << j + 1; R3BTofdHitModulePar* par = fCal_Par->GetModuleParAt(i + 1, j + 1); - smiley(dynamic_cast(hfilename->Get(Form("SqrtQ_vs_PosToT_Plane_%i_Bar_%i", i + 1, j + 1))), - min2, - max2, - para2); + smiley( + dynamic_cast(hfilename->Get(Form("SqrtQ_vs_PosToT_Plane_%i_Bar_%i", i + 1, j + 1))), + min2, + max2, + para2); Double_t offset1 = par->GetOffset1(); Double_t offset2 = par->GetOffset2(); Double_t veff = par->GetVeff(); @@ -243,7 +244,10 @@ void R3BTofdCal2HistoPar::FinishTask() { R3BTofdHitModulePar* par = fCal_Par->GetModuleParAt(i + 1, j + 1); doubleExp( - dynamic_cast(hfilename->Get(Form("Tot1_vs_Pos_Plane_%i_Bar_%i", i + 1, j + 1))), min, max, para); + dynamic_cast(hfilename->Get(Form("Tot1_vs_Pos_Plane_%i_Bar_%i", i + 1, j + 1))), + min, + max, + para); Double_t offset1 = par->GetOffset1(); Double_t offset2 = par->GetOffset2(); Double_t veff = par->GetVeff(); @@ -257,7 +261,10 @@ void R3BTofdCal2HistoPar::FinishTask() { R3BTofdHitModulePar* par = fCal_Par->GetModuleParAt(i + 1, j + 1); doubleExp( - dynamic_cast(hfilename->Get(Form("Tot2_vs_Pos_Plane_%i_Bar_%i", i + 1, j + 1))), min, max, para); + dynamic_cast(hfilename->Get(Form("Tot2_vs_Pos_Plane_%i_Bar_%i", i + 1, j + 1))), + min, + max, + para); Double_t offset1 = par->GetOffset1(); Double_t offset2 = par->GetOffset2(); Double_t veff = par->GetVeff(); @@ -288,7 +295,10 @@ void R3BTofdCal2HistoPar::FinishTask() { R3BTofdHitModulePar* par = fCal_Par->GetModuleParAt(i + 1, j + 1); std::cout << "Calling Plane: " << i + 1 << " Bar " << j + 1 << "\n"; - zcorr(dynamic_cast(hfilename->Get(Form("Q_vs_Pos_Plane_%i_Bar_%i", i + 1, j + 1))), min, max, pars); + zcorr(dynamic_cast(hfilename->Get(Form("Q_vs_Pos_Plane_%i_Bar_%i", i + 1, j + 1))), + min, + max, + pars); Double_t offset1 = par->GetOffset1(); Double_t offset2 = par->GetOffset2(); Double_t veff = par->GetVeff(); @@ -360,7 +370,8 @@ void R3BTofdCal2HistoPar::calcToTOffset(Double_t totLow, Double_t totHigh) if (hfilename->Get(Form("SqrtQ_vs_PosToT_Plane_%i_Bar_%i", i + 1, j + 1))) { LOG(warn) << "Found histo SqrtQ_vs_PosToT_Plane_" << i + 1 << "_Bar_" << j + 1; - auto* h = dynamic_cast(hfilename->Get(Form("SqrtQ_vs_PosToT_Plane_%i_Bar_%i", i + 1, j + 1))->Clone()); + auto* h = + dynamic_cast(hfilename->Get(Form("SqrtQ_vs_PosToT_Plane_%i_Bar_%i", i + 1, j + 1))->Clone()); cToTOffset->cd(1); h->Draw("colz"); auto* histo_py = (TH2F*)h->ProjectionX("histo_py", totLow, totHigh, ""); @@ -478,7 +489,8 @@ void R3BTofdCal2HistoPar::calcLambda(Double_t totLow, Double_t totHigh) if (hfilename->Get(Form("SqrtQ_vs_PosToT_Plane_%i_Bar_%i", i + 1, j + 1))) { LOG(warn) << "Found histo SqrtQ_vs_PosToT_Plane_" << i + 1 << "_Bar_" << j + 1; - auto* h = dynamic_cast(hfilename->Get(Form("SqrtQ_vs_PosToT_Plane_%i_Bar_%i", i + 1, j + 1))->Clone()); + auto* h = + dynamic_cast(hfilename->Get(Form("SqrtQ_vs_PosToT_Plane_%i_Bar_%i", i + 1, j + 1))->Clone()); cToTOffset->cd(1); h->Draw("colz"); auto* histo_py = (TH2F*)h->ProjectionX("histo_py", totLow, totHigh, ""); diff --git a/tof/R3BTofdCal2HitS454.cxx b/tof/R3BTofdCal2HitS454.cxx index 49ac4c0db..cc059f33e 100644 --- a/tof/R3BTofdCal2HitS454.cxx +++ b/tof/R3BTofdCal2HitS454.cxx @@ -43,7 +43,7 @@ // table every time -> linker nor happy. // So do some forward declaration for now, and keep the include in just one // place, for now R3BTofdCal2Histo.cxx. -//#include "mapping_tofd_trig.hh" +// #include "mapping_tofd_trig.hh" extern unsigned g_tofd_trig_map[4][2][48]; void tofd_trig_map_setup(); diff --git a/tof/R3BTofdCal2HitS494.cxx b/tof/R3BTofdCal2HitS494.cxx index 9e62e8bcd..9d067b0f4 100644 --- a/tof/R3BTofdCal2HitS494.cxx +++ b/tof/R3BTofdCal2HitS494.cxx @@ -45,7 +45,7 @@ // table every time -> linker nor happy. // So do some forward declaration for now, and keep the include in just one // place, for now R3BTofdCal2Histo.cxx. -//#include "mapping_tofd_trig.hh" +// #include "mapping_tofd_trig.hh" extern unsigned g_tofd_trig_map[4][2][44]; extern void tofd_trig_map_setup(); diff --git a/tof/R3BTofdDigitizerCal.cxx b/tof/R3BTofdDigitizerCal.cxx index e63f9c766..dd0de24ec 100644 --- a/tof/R3BTofdDigitizerCal.cxx +++ b/tof/R3BTofdDigitizerCal.cxx @@ -93,7 +93,8 @@ void R3BTofdDigitizerCal::Exec(Option_t* opt) // cout<<"R3BTofdDigitizerCal Exec Before Digitize"<GetEntries(); if (!entryNum) @@ -147,9 +148,9 @@ void R3BTofdDigitizerCal::Exec(Option_t* opt) data_element->GetYIn())); } - std::sort(TempHits.begin(), TempHits.end(), [](const TempHit& lhs, const TempHit& rhs) { - return lhs.Time < rhs.Time; - }); + std::sort(TempHits.begin(), + TempHits.end(), + [](const TempHit& lhs, const TempHit& rhs) { return lhs.Time < rhs.Time; }); Int_t number_paddles_hit = 0; for (TempHit& Hit : TempHits) // loop over full range of TempHits; Hit is reference to each TempHit diff --git a/tof/calibration/R3BPtofCal2Hit.h b/tof/calibration/R3BPtofCal2Hit.h index 5fc32260c..549b068dc 100644 --- a/tof/calibration/R3BPtofCal2Hit.h +++ b/tof/calibration/R3BPtofCal2Hit.h @@ -20,8 +20,8 @@ #ifndef R3BPTOFCAL2HIT_H #define R3BPTOFCAL2HIT_H -#include #include "FairTask.h" +#include #define PtofPaddlesPerPlane 8 diff --git a/tof/calibration/R3BPtofParFact.cxx b/tof/calibration/R3BPtofParFact.cxx index d680ddb13..f2a8e8578 100644 --- a/tof/calibration/R3BPtofParFact.cxx +++ b/tof/calibration/R3BPtofParFact.cxx @@ -29,7 +29,7 @@ #include "TList.h" // for TList #include "TString.h" // for TString -//#include // for strcmp, NULL +// #include // for strcmp, NULL using namespace std; diff --git a/tof/mapping_tofd_trig.hh b/tof/mapping_tofd_trig.hh index 235fc53ae..c34abc625 100644 --- a/tof/mapping_tofd_trig.hh +++ b/tof/mapping_tofd_trig.hh @@ -1,389 +1,390 @@ // ./mapping_tofd_gen.bash on Thu Mar 5 10:56:01 CET 2020 unsigned g_tofd_trig_map[4][2][48]; -void tofd_trig_map_setup() { +void tofd_trig_map_setup() +{ - g_tofd_trig_map[0][0][0] = 0; - g_tofd_trig_map[0][0][1] = 0; - g_tofd_trig_map[0][0][2] = 0; - g_tofd_trig_map[0][0][3] = 0; - g_tofd_trig_map[0][0][4] = 0; - g_tofd_trig_map[0][0][5] = 0; - g_tofd_trig_map[0][0][6] = 0; - g_tofd_trig_map[0][0][7] = 0; - g_tofd_trig_map[0][1][0] = 0; - g_tofd_trig_map[0][1][1] = 0; - g_tofd_trig_map[0][1][2] = 0; - g_tofd_trig_map[0][1][3] = 0; - g_tofd_trig_map[0][1][4] = 0; - g_tofd_trig_map[0][1][5] = 0; - g_tofd_trig_map[0][1][6] = 0; - g_tofd_trig_map[0][1][7] = 0; - g_tofd_trig_map[0][0][8] = 1; - g_tofd_trig_map[0][0][9] = 1; - g_tofd_trig_map[0][0][10] = 1; - g_tofd_trig_map[0][0][11] = 1; - g_tofd_trig_map[0][0][12] = 1; - g_tofd_trig_map[0][0][13] = 1; - g_tofd_trig_map[0][0][14] = 1; - g_tofd_trig_map[0][0][15] = 1; - g_tofd_trig_map[0][1][8] = 1; - g_tofd_trig_map[0][1][9] = 1; - g_tofd_trig_map[0][1][10] = 1; - g_tofd_trig_map[0][1][11] = 1; - g_tofd_trig_map[0][1][12] = 1; - g_tofd_trig_map[0][1][13] = 1; - g_tofd_trig_map[0][1][14] = 1; - g_tofd_trig_map[0][1][15] = 1; - g_tofd_trig_map[0][0][16] = 2; - g_tofd_trig_map[0][0][17] = 2; - g_tofd_trig_map[0][0][18] = 2; - g_tofd_trig_map[0][0][19] = 2; - g_tofd_trig_map[0][0][20] = 2; - g_tofd_trig_map[0][0][21] = 2; - g_tofd_trig_map[0][0][22] = 2; - g_tofd_trig_map[0][0][23] = 2; - g_tofd_trig_map[0][1][16] = 2; - g_tofd_trig_map[0][1][17] = 2; - g_tofd_trig_map[0][1][18] = 2; - g_tofd_trig_map[0][1][19] = 2; - g_tofd_trig_map[0][1][20] = 2; - g_tofd_trig_map[0][1][21] = 2; - g_tofd_trig_map[0][1][22] = 2; - g_tofd_trig_map[0][1][23] = 2; - g_tofd_trig_map[0][0][24] = 3; - g_tofd_trig_map[0][0][25] = 3; - g_tofd_trig_map[0][0][26] = 3; - g_tofd_trig_map[0][0][27] = 3; - g_tofd_trig_map[0][0][28] = 3; - g_tofd_trig_map[0][0][29] = 3; - g_tofd_trig_map[0][0][30] = 3; - g_tofd_trig_map[0][0][31] = 3; - g_tofd_trig_map[0][1][24] = 3; - g_tofd_trig_map[0][1][25] = 3; - g_tofd_trig_map[0][1][26] = 3; - g_tofd_trig_map[0][1][27] = 3; - g_tofd_trig_map[0][1][28] = 3; - g_tofd_trig_map[0][1][29] = 3; - g_tofd_trig_map[0][1][30] = 3; - g_tofd_trig_map[0][1][31] = 3; - g_tofd_trig_map[0][0][32] = 4; - g_tofd_trig_map[0][0][33] = 4; - g_tofd_trig_map[0][0][34] = 4; - g_tofd_trig_map[0][0][35] = 4; - g_tofd_trig_map[0][0][36] = 4; - g_tofd_trig_map[0][0][37] = 4; - g_tofd_trig_map[0][0][38] = 4; - g_tofd_trig_map[0][0][39] = 4; - g_tofd_trig_map[0][1][32] = 4; - g_tofd_trig_map[0][1][33] = 4; - g_tofd_trig_map[0][1][34] = 4; - g_tofd_trig_map[0][1][35] = 4; - g_tofd_trig_map[0][1][36] = 4; - g_tofd_trig_map[0][1][37] = 4; - g_tofd_trig_map[0][1][38] = 4; - g_tofd_trig_map[0][1][39] = 4; - g_tofd_trig_map[0][0][40] = 5; - g_tofd_trig_map[0][0][41] = 5; - g_tofd_trig_map[0][0][42] = 5; - g_tofd_trig_map[0][0][43] = 5; - g_tofd_trig_map[0][0][44] = 5; - g_tofd_trig_map[0][0][45] = 5; - g_tofd_trig_map[0][0][46] = 5; - g_tofd_trig_map[0][0][47] = 5; - g_tofd_trig_map[0][1][40] = 5; - g_tofd_trig_map[0][1][41] = 5; - g_tofd_trig_map[0][1][42] = 5; - g_tofd_trig_map[0][1][43] = 5; - g_tofd_trig_map[0][1][44] = 5; - g_tofd_trig_map[0][1][45] = 5; - g_tofd_trig_map[0][1][46] = 5; - g_tofd_trig_map[0][1][47] = 5; - g_tofd_trig_map[1][0][0] = 6; - g_tofd_trig_map[1][0][1] = 6; - g_tofd_trig_map[1][0][2] = 6; - g_tofd_trig_map[1][0][3] = 6; - g_tofd_trig_map[1][0][4] = 6; - g_tofd_trig_map[1][0][5] = 6; - g_tofd_trig_map[1][0][6] = 6; - g_tofd_trig_map[1][0][7] = 6; - g_tofd_trig_map[1][1][0] = 6; - g_tofd_trig_map[1][1][1] = 6; - g_tofd_trig_map[1][1][2] = 6; - g_tofd_trig_map[1][1][3] = 6; - g_tofd_trig_map[1][1][4] = 6; - g_tofd_trig_map[1][1][5] = 6; - g_tofd_trig_map[1][1][6] = 6; - g_tofd_trig_map[1][1][7] = 6; - g_tofd_trig_map[1][0][8] = 7; - g_tofd_trig_map[1][0][9] = 7; - g_tofd_trig_map[1][0][10] = 7; - g_tofd_trig_map[1][0][11] = 7; - g_tofd_trig_map[1][0][12] = 7; - g_tofd_trig_map[1][0][13] = 7; - g_tofd_trig_map[1][0][14] = 7; - g_tofd_trig_map[1][0][15] = 7; - g_tofd_trig_map[1][1][8] = 7; - g_tofd_trig_map[1][1][9] = 7; - g_tofd_trig_map[1][1][10] = 7; - g_tofd_trig_map[1][1][11] = 7; - g_tofd_trig_map[1][1][12] = 7; - g_tofd_trig_map[1][1][13] = 7; - g_tofd_trig_map[1][1][14] = 7; - g_tofd_trig_map[1][1][15] = 7; - g_tofd_trig_map[1][0][16] = 8; - g_tofd_trig_map[1][0][17] = 8; - g_tofd_trig_map[1][0][18] = 8; - g_tofd_trig_map[1][0][19] = 8; - g_tofd_trig_map[1][0][20] = 8; - g_tofd_trig_map[1][0][21] = 8; - g_tofd_trig_map[1][0][22] = 8; - g_tofd_trig_map[1][0][23] = 8; - g_tofd_trig_map[1][1][16] = 8; - g_tofd_trig_map[1][1][17] = 8; - g_tofd_trig_map[1][1][18] = 8; - g_tofd_trig_map[1][1][19] = 8; - g_tofd_trig_map[1][1][20] = 8; - g_tofd_trig_map[1][1][21] = 8; - g_tofd_trig_map[1][1][22] = 8; - g_tofd_trig_map[1][1][23] = 8; - g_tofd_trig_map[1][0][24] = 9; - g_tofd_trig_map[1][0][25] = 9; - g_tofd_trig_map[1][0][26] = 9; - g_tofd_trig_map[1][0][27] = 9; - g_tofd_trig_map[1][0][28] = 9; - g_tofd_trig_map[1][0][29] = 9; - g_tofd_trig_map[1][0][30] = 9; - g_tofd_trig_map[1][0][31] = 9; - g_tofd_trig_map[1][1][24] = 9; - g_tofd_trig_map[1][1][25] = 9; - g_tofd_trig_map[1][1][26] = 9; - g_tofd_trig_map[1][1][27] = 9; - g_tofd_trig_map[1][1][28] = 9; - g_tofd_trig_map[1][1][29] = 9; - g_tofd_trig_map[1][1][30] = 9; - g_tofd_trig_map[1][1][31] = 9; - g_tofd_trig_map[1][0][32] = 10; - g_tofd_trig_map[1][0][33] = 10; - g_tofd_trig_map[1][0][34] = 10; - g_tofd_trig_map[1][0][35] = 10; - g_tofd_trig_map[1][0][36] = 10; - g_tofd_trig_map[1][0][37] = 10; - g_tofd_trig_map[1][0][38] = 10; - g_tofd_trig_map[1][0][39] = 10; - g_tofd_trig_map[1][1][32] = 10; - g_tofd_trig_map[1][1][33] = 10; - g_tofd_trig_map[1][1][34] = 10; - g_tofd_trig_map[1][1][35] = 10; - g_tofd_trig_map[1][1][36] = 10; - g_tofd_trig_map[1][1][37] = 10; - g_tofd_trig_map[1][1][38] = 10; - g_tofd_trig_map[1][1][39] = 10; - g_tofd_trig_map[1][0][40] = 11; - g_tofd_trig_map[1][0][41] = 11; - g_tofd_trig_map[1][0][42] = 11; - g_tofd_trig_map[1][0][43] = 11; - g_tofd_trig_map[1][0][44] = 11; - g_tofd_trig_map[1][0][45] = 11; - g_tofd_trig_map[1][0][46] = 11; - g_tofd_trig_map[1][0][47] = 11; - g_tofd_trig_map[1][1][40] = 11; - g_tofd_trig_map[1][1][41] = 11; - g_tofd_trig_map[1][1][42] = 11; - g_tofd_trig_map[1][1][43] = 11; - g_tofd_trig_map[1][1][44] = 11; - g_tofd_trig_map[1][1][45] = 11; - g_tofd_trig_map[1][1][46] = 11; - g_tofd_trig_map[1][1][47] = 11; - g_tofd_trig_map[2][0][0] = 12; - g_tofd_trig_map[2][0][1] = 12; - g_tofd_trig_map[2][0][2] = 12; - g_tofd_trig_map[2][0][3] = 12; - g_tofd_trig_map[2][0][4] = 12; - g_tofd_trig_map[2][0][5] = 12; - g_tofd_trig_map[2][0][6] = 12; - g_tofd_trig_map[2][0][7] = 12; - g_tofd_trig_map[2][1][0] = 12; - g_tofd_trig_map[2][1][1] = 12; - g_tofd_trig_map[2][1][2] = 12; - g_tofd_trig_map[2][1][3] = 12; - g_tofd_trig_map[2][1][4] = 12; - g_tofd_trig_map[2][1][5] = 12; - g_tofd_trig_map[2][1][6] = 12; - g_tofd_trig_map[2][1][7] = 12; - g_tofd_trig_map[2][0][8] = 13; - g_tofd_trig_map[2][0][9] = 13; - g_tofd_trig_map[2][0][10] = 13; - g_tofd_trig_map[2][0][11] = 13; - g_tofd_trig_map[2][0][12] = 13; - g_tofd_trig_map[2][0][13] = 13; - g_tofd_trig_map[2][0][14] = 13; - g_tofd_trig_map[2][0][15] = 13; - g_tofd_trig_map[2][1][8] = 13; - g_tofd_trig_map[2][1][9] = 13; - g_tofd_trig_map[2][1][10] = 13; - g_tofd_trig_map[2][1][11] = 13; - g_tofd_trig_map[2][1][12] = 13; - g_tofd_trig_map[2][1][13] = 13; - g_tofd_trig_map[2][1][14] = 13; - g_tofd_trig_map[2][1][15] = 13; - g_tofd_trig_map[2][0][16] = 14; - g_tofd_trig_map[2][0][17] = 14; - g_tofd_trig_map[2][0][18] = 14; - g_tofd_trig_map[2][0][19] = 14; - g_tofd_trig_map[2][0][20] = 14; - g_tofd_trig_map[2][0][21] = 14; - g_tofd_trig_map[2][0][22] = 14; - g_tofd_trig_map[2][0][23] = 14; - g_tofd_trig_map[2][1][16] = 14; - g_tofd_trig_map[2][1][17] = 14; - g_tofd_trig_map[2][1][18] = 14; - g_tofd_trig_map[2][1][19] = 14; - g_tofd_trig_map[2][1][20] = 14; - g_tofd_trig_map[2][1][21] = 14; - g_tofd_trig_map[2][1][22] = 14; - g_tofd_trig_map[2][1][23] = 14; - g_tofd_trig_map[2][0][24] = 15; - g_tofd_trig_map[2][0][25] = 15; - g_tofd_trig_map[2][0][26] = 15; - g_tofd_trig_map[2][0][27] = 15; - g_tofd_trig_map[2][0][28] = 15; - g_tofd_trig_map[2][0][29] = 15; - g_tofd_trig_map[2][0][30] = 15; - g_tofd_trig_map[2][0][31] = 15; - g_tofd_trig_map[2][1][24] = 15; - g_tofd_trig_map[2][1][25] = 15; - g_tofd_trig_map[2][1][26] = 15; - g_tofd_trig_map[2][1][27] = 15; - g_tofd_trig_map[2][1][28] = 15; - g_tofd_trig_map[2][1][29] = 15; - g_tofd_trig_map[2][1][30] = 15; - g_tofd_trig_map[2][1][31] = 15; - g_tofd_trig_map[2][0][32] = 16; - g_tofd_trig_map[2][0][33] = 16; - g_tofd_trig_map[2][0][34] = 16; - g_tofd_trig_map[2][0][35] = 16; - g_tofd_trig_map[2][0][36] = 16; - g_tofd_trig_map[2][0][37] = 16; - g_tofd_trig_map[2][0][38] = 16; - g_tofd_trig_map[2][0][39] = 16; - g_tofd_trig_map[2][1][32] = 16; - g_tofd_trig_map[2][1][33] = 16; - g_tofd_trig_map[2][1][34] = 16; - g_tofd_trig_map[2][1][35] = 16; - g_tofd_trig_map[2][1][36] = 16; - g_tofd_trig_map[2][1][37] = 16; - g_tofd_trig_map[2][1][38] = 16; - g_tofd_trig_map[2][1][39] = 16; - g_tofd_trig_map[2][0][40] = 17; - g_tofd_trig_map[2][0][41] = 17; - g_tofd_trig_map[2][0][42] = 17; - g_tofd_trig_map[2][0][43] = 17; - g_tofd_trig_map[2][0][44] = 17; - g_tofd_trig_map[2][0][45] = 17; - g_tofd_trig_map[2][0][46] = 17; - g_tofd_trig_map[2][0][47] = 17; - g_tofd_trig_map[2][1][40] = 17; - g_tofd_trig_map[2][1][41] = 17; - g_tofd_trig_map[2][1][42] = 17; - g_tofd_trig_map[2][1][43] = 17; - g_tofd_trig_map[2][1][44] = 17; - g_tofd_trig_map[2][1][45] = 17; - g_tofd_trig_map[2][1][46] = 17; - g_tofd_trig_map[2][1][47] = 17; - g_tofd_trig_map[3][0][0] = 18; - g_tofd_trig_map[3][0][1] = 18; - g_tofd_trig_map[3][0][2] = 18; - g_tofd_trig_map[3][0][3] = 18; - g_tofd_trig_map[3][0][4] = 18; - g_tofd_trig_map[3][0][5] = 18; - g_tofd_trig_map[3][0][6] = 18; - g_tofd_trig_map[3][0][7] = 18; - g_tofd_trig_map[3][1][0] = 18; - g_tofd_trig_map[3][1][1] = 18; - g_tofd_trig_map[3][1][2] = 18; - g_tofd_trig_map[3][1][3] = 18; - g_tofd_trig_map[3][1][4] = 18; - g_tofd_trig_map[3][1][5] = 18; - g_tofd_trig_map[3][1][6] = 18; - g_tofd_trig_map[3][1][7] = 18; - g_tofd_trig_map[3][0][8] = 19; - g_tofd_trig_map[3][0][9] = 19; - g_tofd_trig_map[3][0][10] = 19; - g_tofd_trig_map[3][0][11] = 19; - g_tofd_trig_map[3][0][12] = 19; - g_tofd_trig_map[3][0][13] = 19; - g_tofd_trig_map[3][0][14] = 19; - g_tofd_trig_map[3][0][15] = 19; - g_tofd_trig_map[3][1][8] = 19; - g_tofd_trig_map[3][1][9] = 19; - g_tofd_trig_map[3][1][10] = 19; - g_tofd_trig_map[3][1][11] = 19; - g_tofd_trig_map[3][1][12] = 19; - g_tofd_trig_map[3][1][13] = 19; - g_tofd_trig_map[3][1][14] = 19; - g_tofd_trig_map[3][1][15] = 19; - g_tofd_trig_map[3][0][16] = 20; - g_tofd_trig_map[3][0][17] = 20; - g_tofd_trig_map[3][0][18] = 20; - g_tofd_trig_map[3][0][19] = 20; - g_tofd_trig_map[3][0][20] = 20; - g_tofd_trig_map[3][0][21] = 20; - g_tofd_trig_map[3][0][22] = 20; - g_tofd_trig_map[3][0][23] = 20; - g_tofd_trig_map[3][1][16] = 20; - g_tofd_trig_map[3][1][17] = 20; - g_tofd_trig_map[3][1][18] = 20; - g_tofd_trig_map[3][1][19] = 20; - g_tofd_trig_map[3][1][20] = 20; - g_tofd_trig_map[3][1][21] = 20; - g_tofd_trig_map[3][1][22] = 20; - g_tofd_trig_map[3][1][23] = 20; - g_tofd_trig_map[3][0][24] = 21; - g_tofd_trig_map[3][0][25] = 21; - g_tofd_trig_map[3][0][26] = 21; - g_tofd_trig_map[3][0][27] = 21; - g_tofd_trig_map[3][0][28] = 21; - g_tofd_trig_map[3][0][29] = 21; - g_tofd_trig_map[3][0][30] = 21; - g_tofd_trig_map[3][0][31] = 21; - g_tofd_trig_map[3][1][24] = 21; - g_tofd_trig_map[3][1][25] = 21; - g_tofd_trig_map[3][1][26] = 21; - g_tofd_trig_map[3][1][27] = 21; - g_tofd_trig_map[3][1][28] = 21; - g_tofd_trig_map[3][1][29] = 21; - g_tofd_trig_map[3][1][30] = 21; - g_tofd_trig_map[3][1][31] = 21; - g_tofd_trig_map[3][0][32] = 22; - g_tofd_trig_map[3][0][33] = 22; - g_tofd_trig_map[3][0][34] = 22; - g_tofd_trig_map[3][0][35] = 22; - g_tofd_trig_map[3][0][36] = 22; - g_tofd_trig_map[3][0][37] = 22; - g_tofd_trig_map[3][0][38] = 22; - g_tofd_trig_map[3][0][39] = 22; - g_tofd_trig_map[3][1][32] = 22; - g_tofd_trig_map[3][1][33] = 22; - g_tofd_trig_map[3][1][34] = 22; - g_tofd_trig_map[3][1][35] = 22; - g_tofd_trig_map[3][1][36] = 22; - g_tofd_trig_map[3][1][37] = 22; - g_tofd_trig_map[3][1][38] = 22; - g_tofd_trig_map[3][1][39] = 22; - g_tofd_trig_map[3][0][40] = 23; - g_tofd_trig_map[3][0][41] = 23; - g_tofd_trig_map[3][0][42] = 23; - g_tofd_trig_map[3][0][43] = 23; - g_tofd_trig_map[3][0][44] = 23; - g_tofd_trig_map[3][0][45] = 23; - g_tofd_trig_map[3][0][46] = 23; - g_tofd_trig_map[3][0][47] = 23; - g_tofd_trig_map[3][1][40] = 23; - g_tofd_trig_map[3][1][41] = 23; - g_tofd_trig_map[3][1][42] = 23; - g_tofd_trig_map[3][1][43] = 23; - g_tofd_trig_map[3][1][44] = 23; - g_tofd_trig_map[3][1][45] = 23; - g_tofd_trig_map[3][1][46] = 23; - g_tofd_trig_map[3][1][47] = 23; + g_tofd_trig_map[0][0][0] = 0; + g_tofd_trig_map[0][0][1] = 0; + g_tofd_trig_map[0][0][2] = 0; + g_tofd_trig_map[0][0][3] = 0; + g_tofd_trig_map[0][0][4] = 0; + g_tofd_trig_map[0][0][5] = 0; + g_tofd_trig_map[0][0][6] = 0; + g_tofd_trig_map[0][0][7] = 0; + g_tofd_trig_map[0][1][0] = 0; + g_tofd_trig_map[0][1][1] = 0; + g_tofd_trig_map[0][1][2] = 0; + g_tofd_trig_map[0][1][3] = 0; + g_tofd_trig_map[0][1][4] = 0; + g_tofd_trig_map[0][1][5] = 0; + g_tofd_trig_map[0][1][6] = 0; + g_tofd_trig_map[0][1][7] = 0; + g_tofd_trig_map[0][0][8] = 1; + g_tofd_trig_map[0][0][9] = 1; + g_tofd_trig_map[0][0][10] = 1; + g_tofd_trig_map[0][0][11] = 1; + g_tofd_trig_map[0][0][12] = 1; + g_tofd_trig_map[0][0][13] = 1; + g_tofd_trig_map[0][0][14] = 1; + g_tofd_trig_map[0][0][15] = 1; + g_tofd_trig_map[0][1][8] = 1; + g_tofd_trig_map[0][1][9] = 1; + g_tofd_trig_map[0][1][10] = 1; + g_tofd_trig_map[0][1][11] = 1; + g_tofd_trig_map[0][1][12] = 1; + g_tofd_trig_map[0][1][13] = 1; + g_tofd_trig_map[0][1][14] = 1; + g_tofd_trig_map[0][1][15] = 1; + g_tofd_trig_map[0][0][16] = 2; + g_tofd_trig_map[0][0][17] = 2; + g_tofd_trig_map[0][0][18] = 2; + g_tofd_trig_map[0][0][19] = 2; + g_tofd_trig_map[0][0][20] = 2; + g_tofd_trig_map[0][0][21] = 2; + g_tofd_trig_map[0][0][22] = 2; + g_tofd_trig_map[0][0][23] = 2; + g_tofd_trig_map[0][1][16] = 2; + g_tofd_trig_map[0][1][17] = 2; + g_tofd_trig_map[0][1][18] = 2; + g_tofd_trig_map[0][1][19] = 2; + g_tofd_trig_map[0][1][20] = 2; + g_tofd_trig_map[0][1][21] = 2; + g_tofd_trig_map[0][1][22] = 2; + g_tofd_trig_map[0][1][23] = 2; + g_tofd_trig_map[0][0][24] = 3; + g_tofd_trig_map[0][0][25] = 3; + g_tofd_trig_map[0][0][26] = 3; + g_tofd_trig_map[0][0][27] = 3; + g_tofd_trig_map[0][0][28] = 3; + g_tofd_trig_map[0][0][29] = 3; + g_tofd_trig_map[0][0][30] = 3; + g_tofd_trig_map[0][0][31] = 3; + g_tofd_trig_map[0][1][24] = 3; + g_tofd_trig_map[0][1][25] = 3; + g_tofd_trig_map[0][1][26] = 3; + g_tofd_trig_map[0][1][27] = 3; + g_tofd_trig_map[0][1][28] = 3; + g_tofd_trig_map[0][1][29] = 3; + g_tofd_trig_map[0][1][30] = 3; + g_tofd_trig_map[0][1][31] = 3; + g_tofd_trig_map[0][0][32] = 4; + g_tofd_trig_map[0][0][33] = 4; + g_tofd_trig_map[0][0][34] = 4; + g_tofd_trig_map[0][0][35] = 4; + g_tofd_trig_map[0][0][36] = 4; + g_tofd_trig_map[0][0][37] = 4; + g_tofd_trig_map[0][0][38] = 4; + g_tofd_trig_map[0][0][39] = 4; + g_tofd_trig_map[0][1][32] = 4; + g_tofd_trig_map[0][1][33] = 4; + g_tofd_trig_map[0][1][34] = 4; + g_tofd_trig_map[0][1][35] = 4; + g_tofd_trig_map[0][1][36] = 4; + g_tofd_trig_map[0][1][37] = 4; + g_tofd_trig_map[0][1][38] = 4; + g_tofd_trig_map[0][1][39] = 4; + g_tofd_trig_map[0][0][40] = 5; + g_tofd_trig_map[0][0][41] = 5; + g_tofd_trig_map[0][0][42] = 5; + g_tofd_trig_map[0][0][43] = 5; + g_tofd_trig_map[0][0][44] = 5; + g_tofd_trig_map[0][0][45] = 5; + g_tofd_trig_map[0][0][46] = 5; + g_tofd_trig_map[0][0][47] = 5; + g_tofd_trig_map[0][1][40] = 5; + g_tofd_trig_map[0][1][41] = 5; + g_tofd_trig_map[0][1][42] = 5; + g_tofd_trig_map[0][1][43] = 5; + g_tofd_trig_map[0][1][44] = 5; + g_tofd_trig_map[0][1][45] = 5; + g_tofd_trig_map[0][1][46] = 5; + g_tofd_trig_map[0][1][47] = 5; + g_tofd_trig_map[1][0][0] = 6; + g_tofd_trig_map[1][0][1] = 6; + g_tofd_trig_map[1][0][2] = 6; + g_tofd_trig_map[1][0][3] = 6; + g_tofd_trig_map[1][0][4] = 6; + g_tofd_trig_map[1][0][5] = 6; + g_tofd_trig_map[1][0][6] = 6; + g_tofd_trig_map[1][0][7] = 6; + g_tofd_trig_map[1][1][0] = 6; + g_tofd_trig_map[1][1][1] = 6; + g_tofd_trig_map[1][1][2] = 6; + g_tofd_trig_map[1][1][3] = 6; + g_tofd_trig_map[1][1][4] = 6; + g_tofd_trig_map[1][1][5] = 6; + g_tofd_trig_map[1][1][6] = 6; + g_tofd_trig_map[1][1][7] = 6; + g_tofd_trig_map[1][0][8] = 7; + g_tofd_trig_map[1][0][9] = 7; + g_tofd_trig_map[1][0][10] = 7; + g_tofd_trig_map[1][0][11] = 7; + g_tofd_trig_map[1][0][12] = 7; + g_tofd_trig_map[1][0][13] = 7; + g_tofd_trig_map[1][0][14] = 7; + g_tofd_trig_map[1][0][15] = 7; + g_tofd_trig_map[1][1][8] = 7; + g_tofd_trig_map[1][1][9] = 7; + g_tofd_trig_map[1][1][10] = 7; + g_tofd_trig_map[1][1][11] = 7; + g_tofd_trig_map[1][1][12] = 7; + g_tofd_trig_map[1][1][13] = 7; + g_tofd_trig_map[1][1][14] = 7; + g_tofd_trig_map[1][1][15] = 7; + g_tofd_trig_map[1][0][16] = 8; + g_tofd_trig_map[1][0][17] = 8; + g_tofd_trig_map[1][0][18] = 8; + g_tofd_trig_map[1][0][19] = 8; + g_tofd_trig_map[1][0][20] = 8; + g_tofd_trig_map[1][0][21] = 8; + g_tofd_trig_map[1][0][22] = 8; + g_tofd_trig_map[1][0][23] = 8; + g_tofd_trig_map[1][1][16] = 8; + g_tofd_trig_map[1][1][17] = 8; + g_tofd_trig_map[1][1][18] = 8; + g_tofd_trig_map[1][1][19] = 8; + g_tofd_trig_map[1][1][20] = 8; + g_tofd_trig_map[1][1][21] = 8; + g_tofd_trig_map[1][1][22] = 8; + g_tofd_trig_map[1][1][23] = 8; + g_tofd_trig_map[1][0][24] = 9; + g_tofd_trig_map[1][0][25] = 9; + g_tofd_trig_map[1][0][26] = 9; + g_tofd_trig_map[1][0][27] = 9; + g_tofd_trig_map[1][0][28] = 9; + g_tofd_trig_map[1][0][29] = 9; + g_tofd_trig_map[1][0][30] = 9; + g_tofd_trig_map[1][0][31] = 9; + g_tofd_trig_map[1][1][24] = 9; + g_tofd_trig_map[1][1][25] = 9; + g_tofd_trig_map[1][1][26] = 9; + g_tofd_trig_map[1][1][27] = 9; + g_tofd_trig_map[1][1][28] = 9; + g_tofd_trig_map[1][1][29] = 9; + g_tofd_trig_map[1][1][30] = 9; + g_tofd_trig_map[1][1][31] = 9; + g_tofd_trig_map[1][0][32] = 10; + g_tofd_trig_map[1][0][33] = 10; + g_tofd_trig_map[1][0][34] = 10; + g_tofd_trig_map[1][0][35] = 10; + g_tofd_trig_map[1][0][36] = 10; + g_tofd_trig_map[1][0][37] = 10; + g_tofd_trig_map[1][0][38] = 10; + g_tofd_trig_map[1][0][39] = 10; + g_tofd_trig_map[1][1][32] = 10; + g_tofd_trig_map[1][1][33] = 10; + g_tofd_trig_map[1][1][34] = 10; + g_tofd_trig_map[1][1][35] = 10; + g_tofd_trig_map[1][1][36] = 10; + g_tofd_trig_map[1][1][37] = 10; + g_tofd_trig_map[1][1][38] = 10; + g_tofd_trig_map[1][1][39] = 10; + g_tofd_trig_map[1][0][40] = 11; + g_tofd_trig_map[1][0][41] = 11; + g_tofd_trig_map[1][0][42] = 11; + g_tofd_trig_map[1][0][43] = 11; + g_tofd_trig_map[1][0][44] = 11; + g_tofd_trig_map[1][0][45] = 11; + g_tofd_trig_map[1][0][46] = 11; + g_tofd_trig_map[1][0][47] = 11; + g_tofd_trig_map[1][1][40] = 11; + g_tofd_trig_map[1][1][41] = 11; + g_tofd_trig_map[1][1][42] = 11; + g_tofd_trig_map[1][1][43] = 11; + g_tofd_trig_map[1][1][44] = 11; + g_tofd_trig_map[1][1][45] = 11; + g_tofd_trig_map[1][1][46] = 11; + g_tofd_trig_map[1][1][47] = 11; + g_tofd_trig_map[2][0][0] = 12; + g_tofd_trig_map[2][0][1] = 12; + g_tofd_trig_map[2][0][2] = 12; + g_tofd_trig_map[2][0][3] = 12; + g_tofd_trig_map[2][0][4] = 12; + g_tofd_trig_map[2][0][5] = 12; + g_tofd_trig_map[2][0][6] = 12; + g_tofd_trig_map[2][0][7] = 12; + g_tofd_trig_map[2][1][0] = 12; + g_tofd_trig_map[2][1][1] = 12; + g_tofd_trig_map[2][1][2] = 12; + g_tofd_trig_map[2][1][3] = 12; + g_tofd_trig_map[2][1][4] = 12; + g_tofd_trig_map[2][1][5] = 12; + g_tofd_trig_map[2][1][6] = 12; + g_tofd_trig_map[2][1][7] = 12; + g_tofd_trig_map[2][0][8] = 13; + g_tofd_trig_map[2][0][9] = 13; + g_tofd_trig_map[2][0][10] = 13; + g_tofd_trig_map[2][0][11] = 13; + g_tofd_trig_map[2][0][12] = 13; + g_tofd_trig_map[2][0][13] = 13; + g_tofd_trig_map[2][0][14] = 13; + g_tofd_trig_map[2][0][15] = 13; + g_tofd_trig_map[2][1][8] = 13; + g_tofd_trig_map[2][1][9] = 13; + g_tofd_trig_map[2][1][10] = 13; + g_tofd_trig_map[2][1][11] = 13; + g_tofd_trig_map[2][1][12] = 13; + g_tofd_trig_map[2][1][13] = 13; + g_tofd_trig_map[2][1][14] = 13; + g_tofd_trig_map[2][1][15] = 13; + g_tofd_trig_map[2][0][16] = 14; + g_tofd_trig_map[2][0][17] = 14; + g_tofd_trig_map[2][0][18] = 14; + g_tofd_trig_map[2][0][19] = 14; + g_tofd_trig_map[2][0][20] = 14; + g_tofd_trig_map[2][0][21] = 14; + g_tofd_trig_map[2][0][22] = 14; + g_tofd_trig_map[2][0][23] = 14; + g_tofd_trig_map[2][1][16] = 14; + g_tofd_trig_map[2][1][17] = 14; + g_tofd_trig_map[2][1][18] = 14; + g_tofd_trig_map[2][1][19] = 14; + g_tofd_trig_map[2][1][20] = 14; + g_tofd_trig_map[2][1][21] = 14; + g_tofd_trig_map[2][1][22] = 14; + g_tofd_trig_map[2][1][23] = 14; + g_tofd_trig_map[2][0][24] = 15; + g_tofd_trig_map[2][0][25] = 15; + g_tofd_trig_map[2][0][26] = 15; + g_tofd_trig_map[2][0][27] = 15; + g_tofd_trig_map[2][0][28] = 15; + g_tofd_trig_map[2][0][29] = 15; + g_tofd_trig_map[2][0][30] = 15; + g_tofd_trig_map[2][0][31] = 15; + g_tofd_trig_map[2][1][24] = 15; + g_tofd_trig_map[2][1][25] = 15; + g_tofd_trig_map[2][1][26] = 15; + g_tofd_trig_map[2][1][27] = 15; + g_tofd_trig_map[2][1][28] = 15; + g_tofd_trig_map[2][1][29] = 15; + g_tofd_trig_map[2][1][30] = 15; + g_tofd_trig_map[2][1][31] = 15; + g_tofd_trig_map[2][0][32] = 16; + g_tofd_trig_map[2][0][33] = 16; + g_tofd_trig_map[2][0][34] = 16; + g_tofd_trig_map[2][0][35] = 16; + g_tofd_trig_map[2][0][36] = 16; + g_tofd_trig_map[2][0][37] = 16; + g_tofd_trig_map[2][0][38] = 16; + g_tofd_trig_map[2][0][39] = 16; + g_tofd_trig_map[2][1][32] = 16; + g_tofd_trig_map[2][1][33] = 16; + g_tofd_trig_map[2][1][34] = 16; + g_tofd_trig_map[2][1][35] = 16; + g_tofd_trig_map[2][1][36] = 16; + g_tofd_trig_map[2][1][37] = 16; + g_tofd_trig_map[2][1][38] = 16; + g_tofd_trig_map[2][1][39] = 16; + g_tofd_trig_map[2][0][40] = 17; + g_tofd_trig_map[2][0][41] = 17; + g_tofd_trig_map[2][0][42] = 17; + g_tofd_trig_map[2][0][43] = 17; + g_tofd_trig_map[2][0][44] = 17; + g_tofd_trig_map[2][0][45] = 17; + g_tofd_trig_map[2][0][46] = 17; + g_tofd_trig_map[2][0][47] = 17; + g_tofd_trig_map[2][1][40] = 17; + g_tofd_trig_map[2][1][41] = 17; + g_tofd_trig_map[2][1][42] = 17; + g_tofd_trig_map[2][1][43] = 17; + g_tofd_trig_map[2][1][44] = 17; + g_tofd_trig_map[2][1][45] = 17; + g_tofd_trig_map[2][1][46] = 17; + g_tofd_trig_map[2][1][47] = 17; + g_tofd_trig_map[3][0][0] = 18; + g_tofd_trig_map[3][0][1] = 18; + g_tofd_trig_map[3][0][2] = 18; + g_tofd_trig_map[3][0][3] = 18; + g_tofd_trig_map[3][0][4] = 18; + g_tofd_trig_map[3][0][5] = 18; + g_tofd_trig_map[3][0][6] = 18; + g_tofd_trig_map[3][0][7] = 18; + g_tofd_trig_map[3][1][0] = 18; + g_tofd_trig_map[3][1][1] = 18; + g_tofd_trig_map[3][1][2] = 18; + g_tofd_trig_map[3][1][3] = 18; + g_tofd_trig_map[3][1][4] = 18; + g_tofd_trig_map[3][1][5] = 18; + g_tofd_trig_map[3][1][6] = 18; + g_tofd_trig_map[3][1][7] = 18; + g_tofd_trig_map[3][0][8] = 19; + g_tofd_trig_map[3][0][9] = 19; + g_tofd_trig_map[3][0][10] = 19; + g_tofd_trig_map[3][0][11] = 19; + g_tofd_trig_map[3][0][12] = 19; + g_tofd_trig_map[3][0][13] = 19; + g_tofd_trig_map[3][0][14] = 19; + g_tofd_trig_map[3][0][15] = 19; + g_tofd_trig_map[3][1][8] = 19; + g_tofd_trig_map[3][1][9] = 19; + g_tofd_trig_map[3][1][10] = 19; + g_tofd_trig_map[3][1][11] = 19; + g_tofd_trig_map[3][1][12] = 19; + g_tofd_trig_map[3][1][13] = 19; + g_tofd_trig_map[3][1][14] = 19; + g_tofd_trig_map[3][1][15] = 19; + g_tofd_trig_map[3][0][16] = 20; + g_tofd_trig_map[3][0][17] = 20; + g_tofd_trig_map[3][0][18] = 20; + g_tofd_trig_map[3][0][19] = 20; + g_tofd_trig_map[3][0][20] = 20; + g_tofd_trig_map[3][0][21] = 20; + g_tofd_trig_map[3][0][22] = 20; + g_tofd_trig_map[3][0][23] = 20; + g_tofd_trig_map[3][1][16] = 20; + g_tofd_trig_map[3][1][17] = 20; + g_tofd_trig_map[3][1][18] = 20; + g_tofd_trig_map[3][1][19] = 20; + g_tofd_trig_map[3][1][20] = 20; + g_tofd_trig_map[3][1][21] = 20; + g_tofd_trig_map[3][1][22] = 20; + g_tofd_trig_map[3][1][23] = 20; + g_tofd_trig_map[3][0][24] = 21; + g_tofd_trig_map[3][0][25] = 21; + g_tofd_trig_map[3][0][26] = 21; + g_tofd_trig_map[3][0][27] = 21; + g_tofd_trig_map[3][0][28] = 21; + g_tofd_trig_map[3][0][29] = 21; + g_tofd_trig_map[3][0][30] = 21; + g_tofd_trig_map[3][0][31] = 21; + g_tofd_trig_map[3][1][24] = 21; + g_tofd_trig_map[3][1][25] = 21; + g_tofd_trig_map[3][1][26] = 21; + g_tofd_trig_map[3][1][27] = 21; + g_tofd_trig_map[3][1][28] = 21; + g_tofd_trig_map[3][1][29] = 21; + g_tofd_trig_map[3][1][30] = 21; + g_tofd_trig_map[3][1][31] = 21; + g_tofd_trig_map[3][0][32] = 22; + g_tofd_trig_map[3][0][33] = 22; + g_tofd_trig_map[3][0][34] = 22; + g_tofd_trig_map[3][0][35] = 22; + g_tofd_trig_map[3][0][36] = 22; + g_tofd_trig_map[3][0][37] = 22; + g_tofd_trig_map[3][0][38] = 22; + g_tofd_trig_map[3][0][39] = 22; + g_tofd_trig_map[3][1][32] = 22; + g_tofd_trig_map[3][1][33] = 22; + g_tofd_trig_map[3][1][34] = 22; + g_tofd_trig_map[3][1][35] = 22; + g_tofd_trig_map[3][1][36] = 22; + g_tofd_trig_map[3][1][37] = 22; + g_tofd_trig_map[3][1][38] = 22; + g_tofd_trig_map[3][1][39] = 22; + g_tofd_trig_map[3][0][40] = 23; + g_tofd_trig_map[3][0][41] = 23; + g_tofd_trig_map[3][0][42] = 23; + g_tofd_trig_map[3][0][43] = 23; + g_tofd_trig_map[3][0][44] = 23; + g_tofd_trig_map[3][0][45] = 23; + g_tofd_trig_map[3][0][46] = 23; + g_tofd_trig_map[3][0][47] = 23; + g_tofd_trig_map[3][1][40] = 23; + g_tofd_trig_map[3][1][41] = 23; + g_tofd_trig_map[3][1][42] = 23; + g_tofd_trig_map[3][1][43] = 23; + g_tofd_trig_map[3][1][44] = 23; + g_tofd_trig_map[3][1][45] = 23; + g_tofd_trig_map[3][1][46] = 23; + g_tofd_trig_map[3][1][47] = 23; } diff --git a/tofd/calibration/R3BTofDCal2Hit.cxx b/tofd/calibration/R3BTofDCal2Hit.cxx index 746b30c21..9a020ebed 100644 --- a/tofd/calibration/R3BTofDCal2Hit.cxx +++ b/tofd/calibration/R3BTofDCal2Hit.cxx @@ -17,10 +17,10 @@ // ------------------------------------------------------------ #include "R3BTofDCal2Hit.h" +#include "R3BCoarseTimeStitch.h" #include "R3BEventHeader.h" #include "R3BLogger.h" #include "R3BTCalEngine.h" -#include "R3BCoarseTimeStitch.h" #include "R3BTofDHitModulePar.h" #include "R3BTofDHitPar.h" #include "R3BTofDMappingPar.h" diff --git a/tofd/digi/R3BTofDDigitizerCal.cxx b/tofd/digi/R3BTofDDigitizerCal.cxx index 48a2d8474..fc14a406a 100644 --- a/tofd/digi/R3BTofDDigitizerCal.cxx +++ b/tofd/digi/R3BTofDDigitizerCal.cxx @@ -75,7 +75,8 @@ void R3BTofDDigitizerCal::Exec(Option_t* opt) { Reset(); - auto Digitize = [this](TClonesArray* Points, TClonesArray* Hits, TClonesArray* Trigger, Int_t NumOfChannels) { + auto Digitize = [this](TClonesArray* Points, TClonesArray* Hits, TClonesArray* Trigger, Int_t NumOfChannels) + { Int_t entryNum = Points->GetEntries(); if (!entryNum) @@ -122,9 +123,9 @@ void R3BTofDDigitizerCal::Exec(Option_t* opt) data_element->GetYIn())); } - std::sort(TempHits.begin(), TempHits.end(), [](const TempHit& lhs, const TempHit& rhs) { - return lhs.Time < rhs.Time; - }); + std::sort(TempHits.begin(), + TempHits.end(), + [](const TempHit& lhs, const TempHit& rhs) { return lhs.Time < rhs.Time; }); Int_t number_paddles_hit = 0; for (TempHit& Hit : TempHits) // loop over full range of TempHits; Hit is reference to each TempHit diff --git a/tofd/online/R3BTofDOnlineSpectra.cxx b/tofd/online/R3BTofDOnlineSpectra.cxx index 0ebfd55c7..9aa2f5926 100644 --- a/tofd/online/R3BTofDOnlineSpectra.cxx +++ b/tofd/online/R3BTofDOnlineSpectra.cxx @@ -36,11 +36,11 @@ #include "FairRuntimeDb.h" // R3B headers +#include "R3BCoarseTimeStitch.h" #include "R3BEventHeader.h" #include "R3BLogger.h" #include "R3BLosCalData.h" #include "R3BTCalEngine.h" -#include "R3BCoarseTimeStitch.h" #include "R3BTofDMappingPar.h" #include "R3BTofDOnlineSpectra.h" #include "R3BTofdCalData.h" diff --git a/tofd/pars/R3BTofDCal2HitPar.cxx b/tofd/pars/R3BTofDCal2HitPar.cxx index 1f3ec401a..ca9227433 100644 --- a/tofd/pars/R3BTofDCal2HitPar.cxx +++ b/tofd/pars/R3BTofDCal2HitPar.cxx @@ -12,9 +12,9 @@ ******************************************************************************/ #include "R3BTofDCal2HitPar.h" +#include "R3BCoarseTimeStitch.h" #include "R3BEventHeader.h" #include "R3BLogger.h" -#include "R3BCoarseTimeStitch.h" #include "R3BTofDHitModulePar.h" #include "R3BTofDHitPar.h" #include "R3BTofDMappingPar.h" diff --git a/tofd/pars/R3BTofDHitModulePar.cxx b/tofd/pars/R3BTofDHitModulePar.cxx index fc146f3cb..eccea4e3e 100644 --- a/tofd/pars/R3BTofDHitModulePar.cxx +++ b/tofd/pars/R3BTofDHitModulePar.cxx @@ -16,8 +16,8 @@ #include "FairLogger.h" #include "FairParamList.h" -//#include "TF1.h" -//#include "TH1F.h" +// #include "TF1.h" +// #include "TH1F.h" R3BTofDHitModulePar::R3BTofDHitModulePar(const char* name, const char* title, const char* context, Bool_t own) : FairParGenericSet(name, title, context, own) diff --git a/tofi/mapping_tofi_trig.hh b/tofi/mapping_tofi_trig.hh index 718a1f5fc..543377bc5 100644 --- a/tofi/mapping_tofi_trig.hh +++ b/tofi/mapping_tofi_trig.hh @@ -1,100 +1,101 @@ // ./test.bash on Thu May 20 23:00:35 CEST 2021 unsigned g_tofi_trig_map[2][24]; -void tofi_trig_map_setup() { - g_tofi_trig_map[0][0] = 0; - g_tofi_trig_map[0][0] = 0; - g_tofi_trig_map[0][1] = 0; - g_tofi_trig_map[0][1] = 0; - g_tofi_trig_map[0][2] = 0; - g_tofi_trig_map[0][2] = 0; - g_tofi_trig_map[0][3] = 0; - g_tofi_trig_map[0][3] = 0; - g_tofi_trig_map[0][4] = 0; - g_tofi_trig_map[0][4] = 0; - g_tofi_trig_map[0][5] = 0; - g_tofi_trig_map[0][5] = 0; - g_tofi_trig_map[0][6] = 0; - g_tofi_trig_map[0][6] = 0; - g_tofi_trig_map[0][7] = 0; - g_tofi_trig_map[0][7] = 0; - g_tofi_trig_map[0][8] = 0; - g_tofi_trig_map[0][8] = 0; - g_tofi_trig_map[0][9] = 0; - g_tofi_trig_map[0][9] = 0; - g_tofi_trig_map[0][10] = 0; - g_tofi_trig_map[0][10] = 0; - g_tofi_trig_map[0][11] = 0; - g_tofi_trig_map[0][11] = 0; - g_tofi_trig_map[0][12] = 0; - g_tofi_trig_map[0][12] = 0; - g_tofi_trig_map[0][13] = 0; - g_tofi_trig_map[0][13] = 0; - g_tofi_trig_map[0][14] = 0; - g_tofi_trig_map[0][14] = 0; - g_tofi_trig_map[0][15] = 0; - g_tofi_trig_map[0][15] = 0; - g_tofi_trig_map[0][16] = 1; - g_tofi_trig_map[0][16] = 1; - g_tofi_trig_map[0][17] = 1; - g_tofi_trig_map[0][17] = 1; - g_tofi_trig_map[0][18] = 1; - g_tofi_trig_map[0][18] = 1; - g_tofi_trig_map[0][19] = 1; - g_tofi_trig_map[0][19] = 1; - g_tofi_trig_map[0][20] = 1; - g_tofi_trig_map[0][20] = 1; - g_tofi_trig_map[0][21] = 1; - g_tofi_trig_map[0][21] = 1; - g_tofi_trig_map[0][22] = 1; - g_tofi_trig_map[0][22] = 1; - g_tofi_trig_map[0][23] = 1; - g_tofi_trig_map[0][23] = 1; - g_tofi_trig_map[1][0] = 1; - g_tofi_trig_map[1][0] = 1; - g_tofi_trig_map[1][1] = 1; - g_tofi_trig_map[1][1] = 1; - g_tofi_trig_map[1][2] = 1; - g_tofi_trig_map[1][2] = 1; - g_tofi_trig_map[1][3] = 1; - g_tofi_trig_map[1][3] = 1; - g_tofi_trig_map[1][4] = 1; - g_tofi_trig_map[1][4] = 1; - g_tofi_trig_map[1][5] = 1; - g_tofi_trig_map[1][5] = 1; - g_tofi_trig_map[1][6] = 1; - g_tofi_trig_map[1][6] = 1; - g_tofi_trig_map[1][7] = 1; - g_tofi_trig_map[1][7] = 1; - g_tofi_trig_map[1][8] = 2; - g_tofi_trig_map[1][8] = 2; - g_tofi_trig_map[1][9] = 2; - g_tofi_trig_map[1][9] = 2; - g_tofi_trig_map[1][10] = 2; - g_tofi_trig_map[1][10] = 2; - g_tofi_trig_map[1][11] = 2; - g_tofi_trig_map[1][11] = 2; - g_tofi_trig_map[1][12] = 2; - g_tofi_trig_map[1][12] = 2; - g_tofi_trig_map[1][13] = 2; - g_tofi_trig_map[1][13] = 2; - g_tofi_trig_map[1][14] = 2; - g_tofi_trig_map[1][14] = 2; - g_tofi_trig_map[1][15] = 2; - g_tofi_trig_map[1][15] = 2; - g_tofi_trig_map[1][16] = 2; - g_tofi_trig_map[1][16] = 2; - g_tofi_trig_map[1][17] = 2; - g_tofi_trig_map[1][17] = 2; - g_tofi_trig_map[1][18] = 2; - g_tofi_trig_map[1][18] = 2; - g_tofi_trig_map[1][19] = 2; - g_tofi_trig_map[1][19] = 2; - g_tofi_trig_map[1][20] = 2; - g_tofi_trig_map[1][20] = 2; - g_tofi_trig_map[1][21] = 2; - g_tofi_trig_map[1][21] = 2; - g_tofi_trig_map[1][22] = 2; - g_tofi_trig_map[1][22] = 2; - g_tofi_trig_map[1][23] = 2; - g_tofi_trig_map[1][23] = 2; +void tofi_trig_map_setup() +{ + g_tofi_trig_map[0][0] = 0; + g_tofi_trig_map[0][0] = 0; + g_tofi_trig_map[0][1] = 0; + g_tofi_trig_map[0][1] = 0; + g_tofi_trig_map[0][2] = 0; + g_tofi_trig_map[0][2] = 0; + g_tofi_trig_map[0][3] = 0; + g_tofi_trig_map[0][3] = 0; + g_tofi_trig_map[0][4] = 0; + g_tofi_trig_map[0][4] = 0; + g_tofi_trig_map[0][5] = 0; + g_tofi_trig_map[0][5] = 0; + g_tofi_trig_map[0][6] = 0; + g_tofi_trig_map[0][6] = 0; + g_tofi_trig_map[0][7] = 0; + g_tofi_trig_map[0][7] = 0; + g_tofi_trig_map[0][8] = 0; + g_tofi_trig_map[0][8] = 0; + g_tofi_trig_map[0][9] = 0; + g_tofi_trig_map[0][9] = 0; + g_tofi_trig_map[0][10] = 0; + g_tofi_trig_map[0][10] = 0; + g_tofi_trig_map[0][11] = 0; + g_tofi_trig_map[0][11] = 0; + g_tofi_trig_map[0][12] = 0; + g_tofi_trig_map[0][12] = 0; + g_tofi_trig_map[0][13] = 0; + g_tofi_trig_map[0][13] = 0; + g_tofi_trig_map[0][14] = 0; + g_tofi_trig_map[0][14] = 0; + g_tofi_trig_map[0][15] = 0; + g_tofi_trig_map[0][15] = 0; + g_tofi_trig_map[0][16] = 1; + g_tofi_trig_map[0][16] = 1; + g_tofi_trig_map[0][17] = 1; + g_tofi_trig_map[0][17] = 1; + g_tofi_trig_map[0][18] = 1; + g_tofi_trig_map[0][18] = 1; + g_tofi_trig_map[0][19] = 1; + g_tofi_trig_map[0][19] = 1; + g_tofi_trig_map[0][20] = 1; + g_tofi_trig_map[0][20] = 1; + g_tofi_trig_map[0][21] = 1; + g_tofi_trig_map[0][21] = 1; + g_tofi_trig_map[0][22] = 1; + g_tofi_trig_map[0][22] = 1; + g_tofi_trig_map[0][23] = 1; + g_tofi_trig_map[0][23] = 1; + g_tofi_trig_map[1][0] = 1; + g_tofi_trig_map[1][0] = 1; + g_tofi_trig_map[1][1] = 1; + g_tofi_trig_map[1][1] = 1; + g_tofi_trig_map[1][2] = 1; + g_tofi_trig_map[1][2] = 1; + g_tofi_trig_map[1][3] = 1; + g_tofi_trig_map[1][3] = 1; + g_tofi_trig_map[1][4] = 1; + g_tofi_trig_map[1][4] = 1; + g_tofi_trig_map[1][5] = 1; + g_tofi_trig_map[1][5] = 1; + g_tofi_trig_map[1][6] = 1; + g_tofi_trig_map[1][6] = 1; + g_tofi_trig_map[1][7] = 1; + g_tofi_trig_map[1][7] = 1; + g_tofi_trig_map[1][8] = 2; + g_tofi_trig_map[1][8] = 2; + g_tofi_trig_map[1][9] = 2; + g_tofi_trig_map[1][9] = 2; + g_tofi_trig_map[1][10] = 2; + g_tofi_trig_map[1][10] = 2; + g_tofi_trig_map[1][11] = 2; + g_tofi_trig_map[1][11] = 2; + g_tofi_trig_map[1][12] = 2; + g_tofi_trig_map[1][12] = 2; + g_tofi_trig_map[1][13] = 2; + g_tofi_trig_map[1][13] = 2; + g_tofi_trig_map[1][14] = 2; + g_tofi_trig_map[1][14] = 2; + g_tofi_trig_map[1][15] = 2; + g_tofi_trig_map[1][15] = 2; + g_tofi_trig_map[1][16] = 2; + g_tofi_trig_map[1][16] = 2; + g_tofi_trig_map[1][17] = 2; + g_tofi_trig_map[1][17] = 2; + g_tofi_trig_map[1][18] = 2; + g_tofi_trig_map[1][18] = 2; + g_tofi_trig_map[1][19] = 2; + g_tofi_trig_map[1][19] = 2; + g_tofi_trig_map[1][20] = 2; + g_tofi_trig_map[1][20] = 2; + g_tofi_trig_map[1][21] = 2; + g_tofi_trig_map[1][21] = 2; + g_tofi_trig_map[1][22] = 2; + g_tofi_trig_map[1][22] = 2; + g_tofi_trig_map[1][23] = 2; + g_tofi_trig_map[1][23] = 2; } diff --git a/tofi/pars/R3BTofiHisto2HitPar.cxx b/tofi/pars/R3BTofiHisto2HitPar.cxx index 69289a15e..cfb6e5462 100644 --- a/tofi/pars/R3BTofiHisto2HitPar.cxx +++ b/tofi/pars/R3BTofiHisto2HitPar.cxx @@ -209,10 +209,11 @@ void R3BTofiHisto2HitPar::FinishTask() { LOG(warn) << "Calling Plane " << i + 1 << " Bar " << j + 1; R3BTofiHitModulePar* par = fCal_Par->GetModuleParAt(i + 1, j + 1); - smiley(dynamic_cast(hifilename->Get(Form("SqrtQ_vs_PosToT_Plane_%i_Bar_%i", i + 1, j + 1))), - min2, - max2, - para2); + smiley( + dynamic_cast(hifilename->Get(Form("SqrtQ_vs_PosToT_Plane_%i_Bar_%i", i + 1, j + 1))), + min2, + max2, + para2); Double_t offset1 = par->GetOffset1(); Double_t offset2 = par->GetOffset2(); Double_t veff = par->GetVeff(); @@ -241,7 +242,10 @@ void R3BTofiHisto2HitPar::FinishTask() { R3BTofiHitModulePar* par = fCal_Par->GetModuleParAt(i + 1, j + 1); doubleExp( - dynamic_cast(hifilename->Get(Form("Tot1_vs_Pos_Plane_%i_Bar_%i", i + 1, j + 1))), min, max, para); + dynamic_cast(hifilename->Get(Form("Tot1_vs_Pos_Plane_%i_Bar_%i", i + 1, j + 1))), + min, + max, + para); Double_t offset1 = par->GetOffset1(); Double_t offset2 = par->GetOffset2(); Double_t veff = par->GetVeff(); @@ -255,7 +259,10 @@ void R3BTofiHisto2HitPar::FinishTask() { R3BTofiHitModulePar* par = fCal_Par->GetModuleParAt(i + 1, j + 1); doubleExp( - dynamic_cast(hifilename->Get(Form("Tot2_vs_Pos_Plane_%i_Bar_%i", i + 1, j + 1))), min, max, para); + dynamic_cast(hifilename->Get(Form("Tot2_vs_Pos_Plane_%i_Bar_%i", i + 1, j + 1))), + min, + max, + para); Double_t offset1 = par->GetOffset1(); Double_t offset2 = par->GetOffset2(); Double_t veff = par->GetVeff(); @@ -286,7 +293,10 @@ void R3BTofiHisto2HitPar::FinishTask() { R3BTofiHitModulePar* par = fCal_Par->GetModuleParAt(i + 1, j + 1); std::cout << "Calling Plane: " << i + 1 << " Bar " << j + 1 << "\n"; - zcorr(dynamic_cast(hifilename->Get(Form("Q_vs_Pos_Plane_%i_Bar_%i", i + 1, j + 1))), min, max, pars); + zcorr(dynamic_cast(hifilename->Get(Form("Q_vs_Pos_Plane_%i_Bar_%i", i + 1, j + 1))), + min, + max, + pars); Double_t offset1 = par->GetOffset1(); Double_t offset2 = par->GetOffset2(); Double_t veff = par->GetVeff(); @@ -366,7 +376,8 @@ void R3BTofiHisto2HitPar::calcToTOffset(Double_t totLow, Double_t totHigh) if (hifilename->Get(Form("SqrtQ_vs_PosToT_Plane_%i_Bar_%i", i + 1, j + 1))) { LOG(warn) << "Found histo SqrtQ_vs_PosToT_Plane_" << i + 1 << "_Bar_" << j + 1; - auto* h = dynamic_cast(hifilename->Get(Form("SqrtQ_vs_PosToT_Plane_%i_Bar_%i", i + 1, j + 1))->Clone()); + auto* h = dynamic_cast( + hifilename->Get(Form("SqrtQ_vs_PosToT_Plane_%i_Bar_%i", i + 1, j + 1))->Clone()); cToTOffset->cd(1); h->Draw("colz"); auto* histo_py = (TH2F*)h->ProjectionX("histo_py", totLow, totHigh, ""); @@ -491,7 +502,8 @@ void R3BTofiHisto2HitPar::calcLambda(Double_t totLow, Double_t totHigh) if (hifilename->Get(Form("SqrtQ_vs_PosToT_Plane_%i_Bar_%i", i + 1, j + 1))) { LOG(warn) << "Found histo SqrtQ_vs_PosToT_Plane_" << i + 1 << "_Bar_" << j + 1; - auto* h = dynamic_cast(hifilename->Get(Form("SqrtQ_vs_PosToT_Plane_%i_Bar_%i", i + 1, j + 1))->Clone()); + auto* h = dynamic_cast( + hifilename->Get(Form("SqrtQ_vs_PosToT_Plane_%i_Bar_%i", i + 1, j + 1))->Clone()); cToTOffset->cd(1); h->Draw("colz"); auto* histo_py = (TH2F*)h->ProjectionX("histo_py", totLow, totHigh, ""); diff --git a/tracker_rene/tracker_routines.h b/tracker_rene/tracker_routines.h index 9b3a81338..02dcef28b 100644 --- a/tracker_rene/tracker_routines.h +++ b/tracker_rene/tracker_routines.h @@ -1,19 +1,63 @@ #ifndef TRACKER_ROUTINES_H #define TRACKER_ROUTINES_H -extern"C" { +extern "C" +{ -void init_from_cpp_(); -void single_track_from_cpp_(int *n, bool *dc, double tpos[], double x[], double y[], double z[], bool pat[], double param[], double chi[]); -void double_track_from_cpp_(int *n, bool *dc, double tpos[], double x1[], double y1[], double z1[], bool pat1[],double x2[], double y2[], double z2[], bool pat2[] , double param1[], double param2[], double chi[]); -void multi_track_from_cpp_(int *arraysize, int *n, bool *dc, bool *sd, double tpos[], int det[], int q1[], double x1[], double y1[], double z1[], double param[], double chi[]); -void multi_track_extended_output_from_cpp_(int *arraysize, int *n, bool *dc, bool *sd, double tpos[], int det[], int q1[], double x1[], double y1[], double z1[], double param[], double chi[], bool pat1r[], bool pat2r[]); - - -// for testing purposes -void called_from_cpp_(int *n,double *db); -void called_from_cpp2_(int *n,double db2[], bool bo[], double db3[]); + void init_from_cpp_(); + void single_track_from_cpp_(int* n, + bool* dc, + double tpos[], + double x[], + double y[], + double z[], + bool pat[], + double param[], + double chi[]); + void double_track_from_cpp_(int* n, + bool* dc, + double tpos[], + double x1[], + double y1[], + double z1[], + bool pat1[], + double x2[], + double y2[], + double z2[], + bool pat2[], + double param1[], + double param2[], + double chi[]); + void multi_track_from_cpp_(int* arraysize, + int* n, + bool* dc, + bool* sd, + double tpos[], + int det[], + int q1[], + double x1[], + double y1[], + double z1[], + double param[], + double chi[]); + void multi_track_extended_output_from_cpp_(int* arraysize, + int* n, + bool* dc, + bool* sd, + double tpos[], + int det[], + int q1[], + double x1[], + double y1[], + double z1[], + double param[], + double chi[], + bool pat1r[], + bool pat2r[]); + // for testing purposes + void called_from_cpp_(int* n, double* db); + void called_from_cpp2_(int* n, double db2[], bool bo[], double db3[]); } #endif diff --git a/twim/online/R3BTwimOnlineSpectra.h b/twim/online/R3BTwimOnlineSpectra.h index a5f5a1dd8..21045f613 100644 --- a/twim/online/R3BTwimOnlineSpectra.h +++ b/twim/online/R3BTwimOnlineSpectra.h @@ -95,10 +95,11 @@ class R3BTwimOnlineSpectra : public FairTask */ virtual void Reset_Histo(); - void SetExpId(Int_t exp) { - R3BLOG(info, "fExpId is set locally. Original:" << fExpId <<", New value:" << exp); - R3BLOG(info, "Using R3BEventHeader::SetExpId() is recommended instead."); - fExpId = exp; + void SetExpId(Int_t exp) + { + R3BLOG(info, "fExpId is set locally. Original:" << fExpId << ", New value:" << exp); + R3BLOG(info, "Using R3BEventHeader::SetExpId() is recommended instead."); + fExpId = exp; } private: diff --git a/xball/R3BXBall.cxx b/xball/R3BXBall.cxx index 96afb5e80..c1254f1ed 100644 --- a/xball/R3BXBall.cxx +++ b/xball/R3BXBall.cxx @@ -236,11 +236,13 @@ Bool_t R3BXBall::ProcessHits(FairVolume* vol) { for (Int_t i = 0; i < nCrystalHits; i++) { - if ((dynamic_cast(fXBallCrystalHitCollection->At(i)))->GetCrystalNumber() == copyNo) + if ((dynamic_cast(fXBallCrystalHitCollection->At(i)))->GetCrystalNumber() == + copyNo) { (dynamic_cast(fXBallCrystalHitCollection->At(i))) ->AddMoreEnergy(NUSmearing(fELoss)); - if ((dynamic_cast(fXBallCrystalHitCollection->At(i)))->GetTime() > fTime) + if ((dynamic_cast(fXBallCrystalHitCollection->At(i)))->GetTime() > + fTime) { (dynamic_cast(fXBallCrystalHitCollection->At(i)))->SetTime(fTime); } diff --git a/xball/R3BXBallContFact.cxx b/xball/R3BXBallContFact.cxx index d31523147..566ca62c6 100644 --- a/xball/R3BXBallContFact.cxx +++ b/xball/R3BXBallContFact.cxx @@ -30,10 +30,10 @@ #include "FairRuntimeDb.h" #include "R3BXBallContFact.h" -//#include "R3BXBallParRootFileIo.h" -//#include "R3BXBallParAsciiFileIo.h" +// #include "R3BXBallParRootFileIo.h" +// #include "R3BXBallParAsciiFileIo.h" #include "R3BGeoXBallPar.h" -//#include "R3BXBallDigiPar.h" +// #include "R3BXBallDigiPar.h" static R3BXBallContFact gR3BXBallContFact; diff --git a/xball/xb_crystal_loc.hh b/xball/xb_crystal_loc.hh index b7c5586e9..13ed9ec33 100644 --- a/xball/xb_crystal_loc.hh +++ b/xball/xb_crystal_loc.hh @@ -6,165 +6,165 @@ // Angles in degrees // Syntax: XB_CRYSTAL( , , , , , *, *, *, *, *, *) // -XB_CRYSTAL( 1, XB_TYPE_D, 90.000, 180.000, -90.000, 1, 2, 3, 4, 5, 6) // D 0.000 -XB_CRYSTAL( 2, XB_TYPE_B, 90.000,-163.743, 0.000, 0, 2, 6, 7, 8, 9) // B 0.051 -XB_CRYSTAL( 3, XB_TYPE_C, 73.928,-171.645, -32.656, 0, 1, 3, 9, 10, 11) // C 0.107 -XB_CRYSTAL( 4, XB_TYPE_C, 73.928, 171.645, 212.656, 0, 2, 4, 11, 12, 13) // C 0.107 -XB_CRYSTAL( 5, XB_TYPE_B, 90.000, 163.743, 180.000, 0, 3, 5, 13, 14, 15) // B 0.051 -XB_CRYSTAL( 6, XB_TYPE_C, 106.072, 171.645, 147.344, 0, 4, 6, 15, 16, 17) // C 0.107 -XB_CRYSTAL( 7, XB_TYPE_C, 106.072,-171.645, 32.656, 0, 1, 5, 7, 17, 18) // C 0.107 -XB_CRYSTAL( 8, XB_TYPE_B, 104.686,-153.168, 71.370, 1, 6, 8, 18, 19, 20) // B 0.019 -XB_CRYSTAL( 9, XB_TYPE_A, 90.000,-148.283, 0.000, 1, 7, 9, 20, 21,162) // A 0.003 -XB_CRYSTAL( 10, XB_TYPE_B, 75.314,-153.168, -71.370, 1, 2, 8, 10, 21, 22) // B 0.019 -XB_CRYSTAL( 11, XB_TYPE_D, 60.000,-159.095, 20.905, 9, 2, 11, 24, 23, 22) // D 0.017 -XB_CRYSTAL( 12, XB_TYPE_C, 59.817, 180.000, 90.000, 2, 3, 12, 25, 24, 10) // C 0.064 -XB_CRYSTAL( 13, XB_TYPE_D, 60.000, 159.095, -20.905, 3, 13, 27, 26, 25, 11) // D 0.017 -XB_CRYSTAL( 14, XB_TYPE_B, 75.314, 153.168, 251.370, 3, 4, 14, 28, 27, 12) // B 0.019 -XB_CRYSTAL( 15, XB_TYPE_A, 90.000, 148.283, 180.000, 4, 15, 29, 28, 13,162) // A 0.003 -XB_CRYSTAL( 16, XB_TYPE_B, 104.686, 153.168, 108.630, 4, 5, 16, 30, 29, 14) // B 0.019 -XB_CRYSTAL( 17, XB_TYPE_D, 120.000, 159.095,-159.095, 5, 17, 32, 31, 30, 15) // D 0.017 -XB_CRYSTAL( 18, XB_TYPE_C, 120.183, 180.000, 270.000, 5, 6, 18, 33, 32, 16) // C 0.064 -XB_CRYSTAL( 19, XB_TYPE_D, 120.000,-159.095, 159.095, 6, 7, 19, 34, 33, 17) // D 0.017 -XB_CRYSTAL( 20, XB_TYPE_C, 116.612,-138.914, 110.220, 7, 20, 36, 35, 34, 18) // C 0.022 -XB_CRYSTAL( 21, XB_TYPE_B, 99.014,-135.670, 144.998, 7, 8, 21, 37, 36, 19) // B 0.013 -XB_CRYSTAL( 22, XB_TYPE_B, 80.986,-135.670, 215.002, 8, 9, 22, 38, 37, 20) // B 0.013 -XB_CRYSTAL( 23, XB_TYPE_C, 63.388,-138.914, 249.780, 9, 10, 23, 39, 38, 21) // C 0.014 -XB_CRYSTAL( 24, XB_TYPE_C, 47.634,-142.679, 132.588, 10, 24, 40, 58, 39, 22) // C 0.018 -XB_CRYSTAL( 25, XB_TYPE_B, 45.050,-167.209, 115.890, 10, 11, 25, 41, 40, 23) // B 0.024 -XB_CRYSTAL( 26, XB_TYPE_B, 45.050, 167.209, 64.110, 11, 12, 26, 42, 41, 24) // B 0.024 -XB_CRYSTAL( 27, XB_TYPE_C, 47.634, 142.679, 47.412, 12, 27, 43, 62, 42, 25) // C 0.018 -XB_CRYSTAL( 28, XB_TYPE_C, 63.388, 138.914, -69.780, 12, 13, 28, 44, 43, 26) // C 0.014 -XB_CRYSTAL( 29, XB_TYPE_B, 80.986, 135.670, -35.002, 13, 14, 29, 45, 44, 27) // B 0.013 -XB_CRYSTAL( 30, XB_TYPE_B, 99.014, 135.670, 35.002, 14, 15, 30, 46, 45, 28) // B 0.013 -XB_CRYSTAL( 31, XB_TYPE_C, 116.612, 138.914, 69.780, 15, 16, 31, 47, 46, 29) // C 0.022 -XB_CRYSTAL( 32, XB_TYPE_C, 132.366, 142.679, -47.412, 16, 32, 48, 69, 47, 30) // C 0.018 -XB_CRYSTAL( 33, XB_TYPE_B, 134.950, 167.209, -64.110, 16, 17, 33, 49, 48, 31) // B 0.024 -XB_CRYSTAL( 34, XB_TYPE_B, 134.950,-167.209, 244.110, 17, 18, 34, 50, 49, 32) // B 0.024 -XB_CRYSTAL( 35, XB_TYPE_C, 132.366,-142.679, 227.412, 18, 19, 35, 51, 50, 33) // C 0.018 -XB_CRYSTAL( 36, XB_TYPE_C, 125.985,-123.613, -1.114, 19, 36, 53, 52, 51, 34) // C 0.020 -XB_CRYSTAL( 37, XB_TYPE_D, 108.000,-121.717, 58.283, 19, 20, 37, 54, 53, 35) // D 0.001 -XB_CRYSTAL( 38, XB_TYPE_C, 90.000,-120.183, 180.000, 20, 21, 38, 55, 54, 36) // C 0.013 -XB_CRYSTAL( 39, XB_TYPE_D, 72.000,-121.717, 121.717, 21, 22, 39, 56, 55, 37) // D 0.001 -XB_CRYSTAL( 40, XB_TYPE_C, 54.015,-123.613, 1.114, 22, 23, 58, 57, 56, 38) // C 0.022 -XB_CRYSTAL( 41, XB_TYPE_B, 30.325,-149.860, 172.011, 23, 24, 41, 60, 59, 58) // B 0.018 -XB_CRYSTAL( 42, XB_TYPE_A, 31.717, 180.000, -90.000, 24, 25, 42, 60, 40,162) // A 0.003 -XB_CRYSTAL( 43, XB_TYPE_B, 30.325, 149.860, 7.989, 25, 26, 62, 61, 60, 41) // B 0.018 -XB_CRYSTAL( 44, XB_TYPE_C, 54.015, 123.613, 178.886, 26, 27, 44, 64, 63, 62) // C 0.022 -XB_CRYSTAL( 45, XB_TYPE_D, 72.000, 121.717,-121.717, 27, 28, 45, 65, 64, 43) // D 0.001 -XB_CRYSTAL( 46, XB_TYPE_C, 90.000, 120.183, 0.000, 28, 29, 46, 66, 65, 44) // C 0.013 -XB_CRYSTAL( 47, XB_TYPE_D, 108.000, 121.717, -58.283, 29, 30, 47, 67, 66, 45) // D 0.001 -XB_CRYSTAL( 48, XB_TYPE_C, 125.985, 123.613, 181.114, 30, 31, 69, 68, 67, 46) // C 0.022 -XB_CRYSTAL( 49, XB_TYPE_B, 149.675, 149.860, -7.989, 31, 32, 49, 71, 70, 69) // B 0.018 -XB_CRYSTAL( 50, XB_TYPE_A, 148.283, 180.000, 90.000, 32, 33, 50, 71, 48,162) // A 0.003 -XB_CRYSTAL( 51, XB_TYPE_B, 149.675,-149.860, 187.989, 33, 34, 51, 72, 71, 49) // B 0.018 -XB_CRYSTAL( 52, XB_TYPE_D, 144.000,-121.717, -58.283, 34, 35, 52, 73, 72, 50) // D 0.004 -XB_CRYSTAL( 53, XB_TYPE_B, 133.643,-102.504, 46.296, 35, 53, 74, 98, 73, 51) // B 0.021 -XB_CRYSTAL( 54, XB_TYPE_B, 115.890,-106.368, -25.938, 35, 36, 54, 75, 74, 52) // B 0.016 -XB_CRYSTAL( 55, XB_TYPE_C, 98.026,-106.235, -59.672, 36, 37, 55, 76, 75, 53) // C 0.114 -XB_CRYSTAL( 56, XB_TYPE_C, 81.974,-106.235, 59.672, 37, 38, 56, 77, 76, 54) // C 0.114 -XB_CRYSTAL( 57, XB_TYPE_B, 64.110,-106.368, 25.938, 38, 39, 57, 78, 77, 55) // B 0.016 -XB_CRYSTAL( 58, XB_TYPE_B, 46.357,-102.504, -46.296, 39, 58, 79, 93, 78, 56) // B 0.021 -XB_CRYSTAL( 59, XB_TYPE_D, 36.000,-121.717,-121.717, 39, 23, 40, 59, 79, 57) // D 0.004 -XB_CRYSTAL( 60, XB_TYPE_C, 18.063,-116.764, 175.290, 40, 60, 80, 91, 79, 58) // C 0.114 -XB_CRYSTAL( 61, XB_TYPE_B, 16.257, 180.000, -90.000, 40, 41, 42, 61, 80, 59) // B 0.012 -XB_CRYSTAL( 62, XB_TYPE_C, 18.063, 116.764, 4.710, 42, 62, 88, 89, 80, 60) // C 0.114 -XB_CRYSTAL( 63, XB_TYPE_D, 36.000, 121.717, 121.717, 42, 26, 43, 63, 88, 61) // D 0.004 -XB_CRYSTAL( 64, XB_TYPE_B, 46.357, 102.504, 226.296, 43, 64, 87,109, 88, 62) // B 0.021 -XB_CRYSTAL( 65, XB_TYPE_B, 64.110, 106.368, 154.062, 43, 44, 65, 86, 87, 63) // B 0.016 -XB_CRYSTAL( 66, XB_TYPE_C, 81.974, 106.235, 120.328, 44, 45, 66, 85, 86, 64) // C 0.114 -XB_CRYSTAL( 67, XB_TYPE_C, 98.026, 106.235, 239.672, 45, 46, 67, 84, 85, 65) // C 0.114 -XB_CRYSTAL( 68, XB_TYPE_B, 115.890, 106.368, 205.938, 46, 47, 68, 83, 84, 66) // B 0.016 -XB_CRYSTAL( 69, XB_TYPE_B, 133.643, 102.504, 133.704, 47, 69, 82,104, 83, 67) // B 0.021 -XB_CRYSTAL( 70, XB_TYPE_D, 144.000, 121.717, 58.283, 47, 31, 48, 70, 82, 68) // D 0.004 -XB_CRYSTAL( 71, XB_TYPE_C, 161.937, 116.764, -4.710, 48, 71, 81,102, 82, 69) // C 0.114 -XB_CRYSTAL( 72, XB_TYPE_B, 163.743, 180.000, 90.000, 48, 49, 50, 72, 81, 70) // B 0.012 -XB_CRYSTAL( 73, XB_TYPE_C, 161.937,-116.764, 184.710, 50, 51, 73,100, 81, 71) // C 0.114 -XB_CRYSTAL( 74, XB_TYPE_C, 149.817, -90.000, 90.000, 51, 52, 98, 99,100, 72) // C 0.013 -XB_CRYSTAL( 75, XB_TYPE_A, 121.717, -90.000, -90.000, 52, 53, 75, 97, 98,162) // A 0.003 -XB_CRYSTAL( 76, XB_TYPE_B, 106.257, -90.000, -90.000, 53, 54, 76, 96, 97, 74) // B 0.051 -XB_CRYSTAL( 77, XB_TYPE_D, 90.000, -90.000, 180.000, 54, 55, 77, 95, 96, 75) // D 0.000 -XB_CRYSTAL( 78, XB_TYPE_B, 73.743, -90.000, 90.000, 55, 56, 78, 94, 95, 76) // B 0.051 -XB_CRYSTAL( 79, XB_TYPE_A, 58.283, -90.000, 90.000, 56, 57, 93, 94, 77,162) // A 0.003 -XB_CRYSTAL( 80, XB_TYPE_C, 30.183, -90.000, 270.000, 57, 58, 59, 91, 92, 93) // C 0.013 -XB_CRYSTAL( 81, XB_TYPE_D, 0.000, 0.000, 0.000, 59, 60, 61, 89, 90, 91) // D 0.000 -XB_CRYSTAL( 82, XB_TYPE_D, 180.000, 0.000, 180.000, 70, 71, 72,100,101,102) // D 0.000 -XB_CRYSTAL( 83, XB_TYPE_C, 149.817, 90.000, 90.000, 68, 69, 70,102,103,104) // C 0.013 -XB_CRYSTAL( 84, XB_TYPE_A, 121.717, 90.000, 270.000, 67, 68,104,105, 84,162) // A 0.003 -XB_CRYSTAL( 85, XB_TYPE_B, 106.257, 90.000, 270.000, 66, 67, 83,105,106, 85) // B 0.051 -XB_CRYSTAL( 86, XB_TYPE_D, 90.000, 90.000,-180.000, 65, 66, 84,106,107, 86) // D 0.000 -XB_CRYSTAL( 87, XB_TYPE_B, 73.743, 90.000, 90.000, 64, 65, 85,107,108, 87) // B 0.051 -XB_CRYSTAL( 88, XB_TYPE_A, 58.283, 90.000, 90.000, 63, 64, 86,108,109,162) // A 0.003 -XB_CRYSTAL( 89, XB_TYPE_C, 30.183, 90.000, -90.000, 61, 62, 63,109,110, 89) // C 0.013 -XB_CRYSTAL( 90, XB_TYPE_C, 18.063, 63.236, 175.290, 80, 61, 88,110,111, 90) // C 0.114 -XB_CRYSTAL( 91, XB_TYPE_B, 16.257, 0.000, 270.000, 91, 80, 89,111,112,113) // B 0.012 -XB_CRYSTAL( 92, XB_TYPE_C, 18.063, -63.236, 4.710, 79, 59, 80, 90,113, 92) // C 0.114 -XB_CRYSTAL( 93, XB_TYPE_D, 36.000, -58.283, 121.717, 93, 79, 91,113,130,114) // D 0.004 -XB_CRYSTAL( 94, XB_TYPE_B, 46.357, -77.496, 226.296, 94, 78, 57, 79, 92,114) // B 0.021 -XB_CRYSTAL( 95, XB_TYPE_B, 64.110, -73.632, 154.062, 95, 77, 78, 93,114,115) // B 0.016 -XB_CRYSTAL( 96, XB_TYPE_C, 81.974, -73.765, 120.328, 96, 76, 77, 94,115,116) // C 0.114 -XB_CRYSTAL( 97, XB_TYPE_C, 98.026, -73.765, 239.672, 97, 75, 76, 95,116,117) // C 0.114 -XB_CRYSTAL( 98, XB_TYPE_B, 115.890, -73.632, 205.938, 98, 74, 75, 96,117,118) // B 0.016 -XB_CRYSTAL( 99, XB_TYPE_B, 133.643, -77.496, 133.704, 99, 73, 52, 74, 97,118) // B 0.021 -XB_CRYSTAL( 100, XB_TYPE_D, 144.000, -58.283, 58.283,100, 73, 98,118,135,119) // D 0.004 -XB_CRYSTAL( 101, XB_TYPE_C, 161.937, -63.236, -4.710,101, 81, 72, 73, 99,119) // C 0.114 -XB_CRYSTAL( 102, XB_TYPE_B, 163.743, 0.000, 90.000,102, 81,100,119,120,121) // B 0.012 -XB_CRYSTAL( 103, XB_TYPE_C, 161.937, 63.236, 184.710,103, 82, 70, 81,101,121) // C 0.114 -XB_CRYSTAL( 104, XB_TYPE_D, 144.000, 58.283, -58.283,104, 82,102,121,138,122) // D 0.004 -XB_CRYSTAL( 105, XB_TYPE_B, 133.643, 77.496, 46.296,105, 83, 68, 82,103,122) // B 0.021 -XB_CRYSTAL( 106, XB_TYPE_B, 115.890, 73.632, -25.938,106, 84, 83,104,122,123) // B 0.016 -XB_CRYSTAL( 107, XB_TYPE_C, 98.026, 73.765, -59.672,107, 85, 84,105,123,124) // C 0.114 -XB_CRYSTAL( 108, XB_TYPE_C, 81.974, 73.765, 59.672,108, 86, 85,106,124,125) // C 0.114 -XB_CRYSTAL( 109, XB_TYPE_B, 64.110, 73.632, 25.938,109, 87, 86,107,125,126) // B 0.016 -XB_CRYSTAL( 110, XB_TYPE_B, 46.357, 77.496, -46.296,110, 88, 63, 87,108,126) // B 0.021 -XB_CRYSTAL( 111, XB_TYPE_D, 36.000, 58.283,-121.717,111, 89, 88,109,126,127) // D 0.004 -XB_CRYSTAL( 112, XB_TYPE_B, 30.325, 30.140, 172.011,112, 90, 89,110,127,128) // B 0.018 -XB_CRYSTAL( 113, XB_TYPE_A, 31.717, 0.000, 270.000,113, 90,111,128,129,162) // A 0.003 -XB_CRYSTAL( 114, XB_TYPE_B, 30.325, -30.140, 7.989, 92, 91, 90,112,129,130) // B 0.018 -XB_CRYSTAL( 115, XB_TYPE_C, 54.015, -56.387, 178.886,115, 94, 93, 92,130,131) // C 0.022 -XB_CRYSTAL( 116, XB_TYPE_D, 72.000, -58.283,-121.717,116, 95, 94,114,131,132) // D 0.001 -XB_CRYSTAL( 117, XB_TYPE_C, 90.000, -59.817, 0.000,117, 96, 95,115,132,133) // C 0.013 -XB_CRYSTAL( 118, XB_TYPE_D, 108.000, -58.283, -58.283,118, 97, 96,116,133,134) // D 0.001 -XB_CRYSTAL( 119, XB_TYPE_C, 125.985, -56.387, 181.114, 99, 98, 97,117,134,135) // C 0.022 -XB_CRYSTAL( 120, XB_TYPE_B, 149.675, -30.140, -7.989,120,101,100, 99,135,136) // B 0.018 -XB_CRYSTAL( 121, XB_TYPE_A, 148.283, 0.000, 90.000,121,101,119,136,137,162) // A 0.003 -XB_CRYSTAL( 122, XB_TYPE_B, 149.675, 30.140, 187.989,103,102,101,120,137,138) // B 0.018 -XB_CRYSTAL( 123, XB_TYPE_C, 125.985, 56.387, -1.114,123,105,104,103,138,139) // C 0.022 -XB_CRYSTAL( 124, XB_TYPE_D, 108.000, 58.283, 58.283,124,106,105,122,139,140) // D 0.001 -XB_CRYSTAL( 125, XB_TYPE_C, 90.000, 59.817, 180.000,125,107,106,123,140,141) // C 0.013 -XB_CRYSTAL( 126, XB_TYPE_D, 72.000, 58.283, 121.717,126,108,107,124,141,142) // D 0.001 -XB_CRYSTAL( 127, XB_TYPE_C, 54.015, 56.387, 1.114,127,110,109,108,125,142) // C 0.034 -XB_CRYSTAL( 128, XB_TYPE_C, 47.634, 37.321, 132.588,128,111,110,126,142,143) // C 0.018 -XB_CRYSTAL( 129, XB_TYPE_B, 45.050, 12.791, 115.890,129,112,111,127,143,144) // B 0.024 -XB_CRYSTAL( 130, XB_TYPE_B, 45.050, -12.791, 64.110,130,113,112,128,144,145) // B 0.024 -XB_CRYSTAL( 131, XB_TYPE_C, 47.634, -37.321, 47.412,131,114, 92,113,129,145) // C 0.018 -XB_CRYSTAL( 132, XB_TYPE_C, 63.388, -41.086, -69.780,132,115,114,130,145,146) // C 0.022 -XB_CRYSTAL( 133, XB_TYPE_B, 80.986, -44.330, -35.002,133,116,115,131,146,147) // B 0.013 -XB_CRYSTAL( 134, XB_TYPE_B, 99.014, -44.330, 35.002,134,117,116,132,147,148) // B 0.013 -XB_CRYSTAL( 135, XB_TYPE_C, 116.612, -41.086, 69.780,135,118,117,133,148,149) // C 0.014 -XB_CRYSTAL( 136, XB_TYPE_C, 132.366, -37.321, -47.412,136,119, 99,118,134,149) // C 0.018 -XB_CRYSTAL( 137, XB_TYPE_B, 134.950, -12.791, -64.110,137,120,119,135,149,150) // B 0.024 -XB_CRYSTAL( 138, XB_TYPE_B, 134.950, 12.791, 244.110,138,121,120,136,150,151) // B 0.024 -XB_CRYSTAL( 139, XB_TYPE_C, 132.366, 37.321, 227.412,139,122,103,121,137,151) // C 0.018 -XB_CRYSTAL( 140, XB_TYPE_C, 116.612, 41.086, 110.220,140,123,122,138,151,152) // C 0.014 -XB_CRYSTAL( 141, XB_TYPE_B, 99.014, 44.330, 144.998,141,124,123,139,152,153) // B 0.013 -XB_CRYSTAL( 142, XB_TYPE_B, 80.986, 44.330, 215.002,142,125,124,140,153,154) // B 0.013 -XB_CRYSTAL( 143, XB_TYPE_C, 63.388, 41.086, 249.780,143,127,126,125,141,154) // C 0.022 -XB_CRYSTAL( 144, XB_TYPE_D, 60.000, 20.905, 20.905,144,128,127,142,154,155) // D 0.017 -XB_CRYSTAL( 145, XB_TYPE_C, 59.817, 0.000, 90.000,145,129,128,143,155,156) // C 0.064 -XB_CRYSTAL( 146, XB_TYPE_D, 60.000, -20.905, -20.905,146,131,130,129,144,156) // D 0.017 -XB_CRYSTAL( 147, XB_TYPE_B, 75.314, -26.832, 251.370,147,132,131,145,156,157) // B 0.019 -XB_CRYSTAL( 148, XB_TYPE_A, 90.000, -31.717, 180.000,148,133,132,146,157,162) // A 0.003 -XB_CRYSTAL( 149, XB_TYPE_B, 104.686, -26.832, 108.630,149,134,133,147,157,158) // B 0.019 -XB_CRYSTAL( 150, XB_TYPE_D, 120.000, -20.905,-159.095,150,136,135,134,148,158) // D 0.017 -XB_CRYSTAL( 151, XB_TYPE_C, 120.183, 0.000, 270.000,151,137,136,149,158,159) // C 0.064 -XB_CRYSTAL( 152, XB_TYPE_D, 120.000, 20.905, 159.095,152,139,138,137,150,159) // D 0.017 -XB_CRYSTAL( 153, XB_TYPE_B, 104.686, 26.832, 71.370,153,140,139,151,159,160) // B 0.019 -XB_CRYSTAL( 154, XB_TYPE_A, 90.000, 31.717, 0.000,154,141,140,152,160,162) // A 0.003 -XB_CRYSTAL( 155, XB_TYPE_B, 75.314, 26.832, -71.370,155,143,142,141,153,160) // B 0.019 -XB_CRYSTAL( 156, XB_TYPE_C, 73.928, 8.355, -32.656,156,144,143,154,160,161) // C 0.107 -XB_CRYSTAL( 157, XB_TYPE_C, 73.928, -8.355, 212.656,157,146,145,144,155,161) // C 0.107 -XB_CRYSTAL( 158, XB_TYPE_B, 90.000, -16.257, 180.000,158,148,147,146,156,161) // B 0.051 -XB_CRYSTAL( 159, XB_TYPE_C, 106.072, -8.355, 147.344,159,150,149,148,157,161) // C 0.107 -XB_CRYSTAL( 160, XB_TYPE_C, 106.072, 8.355, 32.656,160,152,151,150,158,161) // C 0.107 -XB_CRYSTAL( 161, XB_TYPE_B, 90.000, 16.257, 0.000,161,155,154,153,152,159) // B 0.051 -XB_CRYSTAL( 162, XB_TYPE_D, 90.000, 0.000, 90.000,155,156,157,158,159,160) // D 0.000 +XB_CRYSTAL(1, XB_TYPE_D, 90.000, 180.000, -90.000, 1, 2, 3, 4, 5, 6) // D 0.000 +XB_CRYSTAL(2, XB_TYPE_B, 90.000, -163.743, 0.000, 0, 2, 6, 7, 8, 9) // B 0.051 +XB_CRYSTAL(3, XB_TYPE_C, 73.928, -171.645, -32.656, 0, 1, 3, 9, 10, 11) // C 0.107 +XB_CRYSTAL(4, XB_TYPE_C, 73.928, 171.645, 212.656, 0, 2, 4, 11, 12, 13) // C 0.107 +XB_CRYSTAL(5, XB_TYPE_B, 90.000, 163.743, 180.000, 0, 3, 5, 13, 14, 15) // B 0.051 +XB_CRYSTAL(6, XB_TYPE_C, 106.072, 171.645, 147.344, 0, 4, 6, 15, 16, 17) // C 0.107 +XB_CRYSTAL(7, XB_TYPE_C, 106.072, -171.645, 32.656, 0, 1, 5, 7, 17, 18) // C 0.107 +XB_CRYSTAL(8, XB_TYPE_B, 104.686, -153.168, 71.370, 1, 6, 8, 18, 19, 20) // B 0.019 +XB_CRYSTAL(9, XB_TYPE_A, 90.000, -148.283, 0.000, 1, 7, 9, 20, 21, 162) // A 0.003 +XB_CRYSTAL(10, XB_TYPE_B, 75.314, -153.168, -71.370, 1, 2, 8, 10, 21, 22) // B 0.019 +XB_CRYSTAL(11, XB_TYPE_D, 60.000, -159.095, 20.905, 9, 2, 11, 24, 23, 22) // D 0.017 +XB_CRYSTAL(12, XB_TYPE_C, 59.817, 180.000, 90.000, 2, 3, 12, 25, 24, 10) // C 0.064 +XB_CRYSTAL(13, XB_TYPE_D, 60.000, 159.095, -20.905, 3, 13, 27, 26, 25, 11) // D 0.017 +XB_CRYSTAL(14, XB_TYPE_B, 75.314, 153.168, 251.370, 3, 4, 14, 28, 27, 12) // B 0.019 +XB_CRYSTAL(15, XB_TYPE_A, 90.000, 148.283, 180.000, 4, 15, 29, 28, 13, 162) // A 0.003 +XB_CRYSTAL(16, XB_TYPE_B, 104.686, 153.168, 108.630, 4, 5, 16, 30, 29, 14) // B 0.019 +XB_CRYSTAL(17, XB_TYPE_D, 120.000, 159.095, -159.095, 5, 17, 32, 31, 30, 15) // D 0.017 +XB_CRYSTAL(18, XB_TYPE_C, 120.183, 180.000, 270.000, 5, 6, 18, 33, 32, 16) // C 0.064 +XB_CRYSTAL(19, XB_TYPE_D, 120.000, -159.095, 159.095, 6, 7, 19, 34, 33, 17) // D 0.017 +XB_CRYSTAL(20, XB_TYPE_C, 116.612, -138.914, 110.220, 7, 20, 36, 35, 34, 18) // C 0.022 +XB_CRYSTAL(21, XB_TYPE_B, 99.014, -135.670, 144.998, 7, 8, 21, 37, 36, 19) // B 0.013 +XB_CRYSTAL(22, XB_TYPE_B, 80.986, -135.670, 215.002, 8, 9, 22, 38, 37, 20) // B 0.013 +XB_CRYSTAL(23, XB_TYPE_C, 63.388, -138.914, 249.780, 9, 10, 23, 39, 38, 21) // C 0.014 +XB_CRYSTAL(24, XB_TYPE_C, 47.634, -142.679, 132.588, 10, 24, 40, 58, 39, 22) // C 0.018 +XB_CRYSTAL(25, XB_TYPE_B, 45.050, -167.209, 115.890, 10, 11, 25, 41, 40, 23) // B 0.024 +XB_CRYSTAL(26, XB_TYPE_B, 45.050, 167.209, 64.110, 11, 12, 26, 42, 41, 24) // B 0.024 +XB_CRYSTAL(27, XB_TYPE_C, 47.634, 142.679, 47.412, 12, 27, 43, 62, 42, 25) // C 0.018 +XB_CRYSTAL(28, XB_TYPE_C, 63.388, 138.914, -69.780, 12, 13, 28, 44, 43, 26) // C 0.014 +XB_CRYSTAL(29, XB_TYPE_B, 80.986, 135.670, -35.002, 13, 14, 29, 45, 44, 27) // B 0.013 +XB_CRYSTAL(30, XB_TYPE_B, 99.014, 135.670, 35.002, 14, 15, 30, 46, 45, 28) // B 0.013 +XB_CRYSTAL(31, XB_TYPE_C, 116.612, 138.914, 69.780, 15, 16, 31, 47, 46, 29) // C 0.022 +XB_CRYSTAL(32, XB_TYPE_C, 132.366, 142.679, -47.412, 16, 32, 48, 69, 47, 30) // C 0.018 +XB_CRYSTAL(33, XB_TYPE_B, 134.950, 167.209, -64.110, 16, 17, 33, 49, 48, 31) // B 0.024 +XB_CRYSTAL(34, XB_TYPE_B, 134.950, -167.209, 244.110, 17, 18, 34, 50, 49, 32) // B 0.024 +XB_CRYSTAL(35, XB_TYPE_C, 132.366, -142.679, 227.412, 18, 19, 35, 51, 50, 33) // C 0.018 +XB_CRYSTAL(36, XB_TYPE_C, 125.985, -123.613, -1.114, 19, 36, 53, 52, 51, 34) // C 0.020 +XB_CRYSTAL(37, XB_TYPE_D, 108.000, -121.717, 58.283, 19, 20, 37, 54, 53, 35) // D 0.001 +XB_CRYSTAL(38, XB_TYPE_C, 90.000, -120.183, 180.000, 20, 21, 38, 55, 54, 36) // C 0.013 +XB_CRYSTAL(39, XB_TYPE_D, 72.000, -121.717, 121.717, 21, 22, 39, 56, 55, 37) // D 0.001 +XB_CRYSTAL(40, XB_TYPE_C, 54.015, -123.613, 1.114, 22, 23, 58, 57, 56, 38) // C 0.022 +XB_CRYSTAL(41, XB_TYPE_B, 30.325, -149.860, 172.011, 23, 24, 41, 60, 59, 58) // B 0.018 +XB_CRYSTAL(42, XB_TYPE_A, 31.717, 180.000, -90.000, 24, 25, 42, 60, 40, 162) // A 0.003 +XB_CRYSTAL(43, XB_TYPE_B, 30.325, 149.860, 7.989, 25, 26, 62, 61, 60, 41) // B 0.018 +XB_CRYSTAL(44, XB_TYPE_C, 54.015, 123.613, 178.886, 26, 27, 44, 64, 63, 62) // C 0.022 +XB_CRYSTAL(45, XB_TYPE_D, 72.000, 121.717, -121.717, 27, 28, 45, 65, 64, 43) // D 0.001 +XB_CRYSTAL(46, XB_TYPE_C, 90.000, 120.183, 0.000, 28, 29, 46, 66, 65, 44) // C 0.013 +XB_CRYSTAL(47, XB_TYPE_D, 108.000, 121.717, -58.283, 29, 30, 47, 67, 66, 45) // D 0.001 +XB_CRYSTAL(48, XB_TYPE_C, 125.985, 123.613, 181.114, 30, 31, 69, 68, 67, 46) // C 0.022 +XB_CRYSTAL(49, XB_TYPE_B, 149.675, 149.860, -7.989, 31, 32, 49, 71, 70, 69) // B 0.018 +XB_CRYSTAL(50, XB_TYPE_A, 148.283, 180.000, 90.000, 32, 33, 50, 71, 48, 162) // A 0.003 +XB_CRYSTAL(51, XB_TYPE_B, 149.675, -149.860, 187.989, 33, 34, 51, 72, 71, 49) // B 0.018 +XB_CRYSTAL(52, XB_TYPE_D, 144.000, -121.717, -58.283, 34, 35, 52, 73, 72, 50) // D 0.004 +XB_CRYSTAL(53, XB_TYPE_B, 133.643, -102.504, 46.296, 35, 53, 74, 98, 73, 51) // B 0.021 +XB_CRYSTAL(54, XB_TYPE_B, 115.890, -106.368, -25.938, 35, 36, 54, 75, 74, 52) // B 0.016 +XB_CRYSTAL(55, XB_TYPE_C, 98.026, -106.235, -59.672, 36, 37, 55, 76, 75, 53) // C 0.114 +XB_CRYSTAL(56, XB_TYPE_C, 81.974, -106.235, 59.672, 37, 38, 56, 77, 76, 54) // C 0.114 +XB_CRYSTAL(57, XB_TYPE_B, 64.110, -106.368, 25.938, 38, 39, 57, 78, 77, 55) // B 0.016 +XB_CRYSTAL(58, XB_TYPE_B, 46.357, -102.504, -46.296, 39, 58, 79, 93, 78, 56) // B 0.021 +XB_CRYSTAL(59, XB_TYPE_D, 36.000, -121.717, -121.717, 39, 23, 40, 59, 79, 57) // D 0.004 +XB_CRYSTAL(60, XB_TYPE_C, 18.063, -116.764, 175.290, 40, 60, 80, 91, 79, 58) // C 0.114 +XB_CRYSTAL(61, XB_TYPE_B, 16.257, 180.000, -90.000, 40, 41, 42, 61, 80, 59) // B 0.012 +XB_CRYSTAL(62, XB_TYPE_C, 18.063, 116.764, 4.710, 42, 62, 88, 89, 80, 60) // C 0.114 +XB_CRYSTAL(63, XB_TYPE_D, 36.000, 121.717, 121.717, 42, 26, 43, 63, 88, 61) // D 0.004 +XB_CRYSTAL(64, XB_TYPE_B, 46.357, 102.504, 226.296, 43, 64, 87, 109, 88, 62) // B 0.021 +XB_CRYSTAL(65, XB_TYPE_B, 64.110, 106.368, 154.062, 43, 44, 65, 86, 87, 63) // B 0.016 +XB_CRYSTAL(66, XB_TYPE_C, 81.974, 106.235, 120.328, 44, 45, 66, 85, 86, 64) // C 0.114 +XB_CRYSTAL(67, XB_TYPE_C, 98.026, 106.235, 239.672, 45, 46, 67, 84, 85, 65) // C 0.114 +XB_CRYSTAL(68, XB_TYPE_B, 115.890, 106.368, 205.938, 46, 47, 68, 83, 84, 66) // B 0.016 +XB_CRYSTAL(69, XB_TYPE_B, 133.643, 102.504, 133.704, 47, 69, 82, 104, 83, 67) // B 0.021 +XB_CRYSTAL(70, XB_TYPE_D, 144.000, 121.717, 58.283, 47, 31, 48, 70, 82, 68) // D 0.004 +XB_CRYSTAL(71, XB_TYPE_C, 161.937, 116.764, -4.710, 48, 71, 81, 102, 82, 69) // C 0.114 +XB_CRYSTAL(72, XB_TYPE_B, 163.743, 180.000, 90.000, 48, 49, 50, 72, 81, 70) // B 0.012 +XB_CRYSTAL(73, XB_TYPE_C, 161.937, -116.764, 184.710, 50, 51, 73, 100, 81, 71) // C 0.114 +XB_CRYSTAL(74, XB_TYPE_C, 149.817, -90.000, 90.000, 51, 52, 98, 99, 100, 72) // C 0.013 +XB_CRYSTAL(75, XB_TYPE_A, 121.717, -90.000, -90.000, 52, 53, 75, 97, 98, 162) // A 0.003 +XB_CRYSTAL(76, XB_TYPE_B, 106.257, -90.000, -90.000, 53, 54, 76, 96, 97, 74) // B 0.051 +XB_CRYSTAL(77, XB_TYPE_D, 90.000, -90.000, 180.000, 54, 55, 77, 95, 96, 75) // D 0.000 +XB_CRYSTAL(78, XB_TYPE_B, 73.743, -90.000, 90.000, 55, 56, 78, 94, 95, 76) // B 0.051 +XB_CRYSTAL(79, XB_TYPE_A, 58.283, -90.000, 90.000, 56, 57, 93, 94, 77, 162) // A 0.003 +XB_CRYSTAL(80, XB_TYPE_C, 30.183, -90.000, 270.000, 57, 58, 59, 91, 92, 93) // C 0.013 +XB_CRYSTAL(81, XB_TYPE_D, 0.000, 0.000, 0.000, 59, 60, 61, 89, 90, 91) // D 0.000 +XB_CRYSTAL(82, XB_TYPE_D, 180.000, 0.000, 180.000, 70, 71, 72, 100, 101, 102) // D 0.000 +XB_CRYSTAL(83, XB_TYPE_C, 149.817, 90.000, 90.000, 68, 69, 70, 102, 103, 104) // C 0.013 +XB_CRYSTAL(84, XB_TYPE_A, 121.717, 90.000, 270.000, 67, 68, 104, 105, 84, 162) // A 0.003 +XB_CRYSTAL(85, XB_TYPE_B, 106.257, 90.000, 270.000, 66, 67, 83, 105, 106, 85) // B 0.051 +XB_CRYSTAL(86, XB_TYPE_D, 90.000, 90.000, -180.000, 65, 66, 84, 106, 107, 86) // D 0.000 +XB_CRYSTAL(87, XB_TYPE_B, 73.743, 90.000, 90.000, 64, 65, 85, 107, 108, 87) // B 0.051 +XB_CRYSTAL(88, XB_TYPE_A, 58.283, 90.000, 90.000, 63, 64, 86, 108, 109, 162) // A 0.003 +XB_CRYSTAL(89, XB_TYPE_C, 30.183, 90.000, -90.000, 61, 62, 63, 109, 110, 89) // C 0.013 +XB_CRYSTAL(90, XB_TYPE_C, 18.063, 63.236, 175.290, 80, 61, 88, 110, 111, 90) // C 0.114 +XB_CRYSTAL(91, XB_TYPE_B, 16.257, 0.000, 270.000, 91, 80, 89, 111, 112, 113) // B 0.012 +XB_CRYSTAL(92, XB_TYPE_C, 18.063, -63.236, 4.710, 79, 59, 80, 90, 113, 92) // C 0.114 +XB_CRYSTAL(93, XB_TYPE_D, 36.000, -58.283, 121.717, 93, 79, 91, 113, 130, 114) // D 0.004 +XB_CRYSTAL(94, XB_TYPE_B, 46.357, -77.496, 226.296, 94, 78, 57, 79, 92, 114) // B 0.021 +XB_CRYSTAL(95, XB_TYPE_B, 64.110, -73.632, 154.062, 95, 77, 78, 93, 114, 115) // B 0.016 +XB_CRYSTAL(96, XB_TYPE_C, 81.974, -73.765, 120.328, 96, 76, 77, 94, 115, 116) // C 0.114 +XB_CRYSTAL(97, XB_TYPE_C, 98.026, -73.765, 239.672, 97, 75, 76, 95, 116, 117) // C 0.114 +XB_CRYSTAL(98, XB_TYPE_B, 115.890, -73.632, 205.938, 98, 74, 75, 96, 117, 118) // B 0.016 +XB_CRYSTAL(99, XB_TYPE_B, 133.643, -77.496, 133.704, 99, 73, 52, 74, 97, 118) // B 0.021 +XB_CRYSTAL(100, XB_TYPE_D, 144.000, -58.283, 58.283, 100, 73, 98, 118, 135, 119) // D 0.004 +XB_CRYSTAL(101, XB_TYPE_C, 161.937, -63.236, -4.710, 101, 81, 72, 73, 99, 119) // C 0.114 +XB_CRYSTAL(102, XB_TYPE_B, 163.743, 0.000, 90.000, 102, 81, 100, 119, 120, 121) // B 0.012 +XB_CRYSTAL(103, XB_TYPE_C, 161.937, 63.236, 184.710, 103, 82, 70, 81, 101, 121) // C 0.114 +XB_CRYSTAL(104, XB_TYPE_D, 144.000, 58.283, -58.283, 104, 82, 102, 121, 138, 122) // D 0.004 +XB_CRYSTAL(105, XB_TYPE_B, 133.643, 77.496, 46.296, 105, 83, 68, 82, 103, 122) // B 0.021 +XB_CRYSTAL(106, XB_TYPE_B, 115.890, 73.632, -25.938, 106, 84, 83, 104, 122, 123) // B 0.016 +XB_CRYSTAL(107, XB_TYPE_C, 98.026, 73.765, -59.672, 107, 85, 84, 105, 123, 124) // C 0.114 +XB_CRYSTAL(108, XB_TYPE_C, 81.974, 73.765, 59.672, 108, 86, 85, 106, 124, 125) // C 0.114 +XB_CRYSTAL(109, XB_TYPE_B, 64.110, 73.632, 25.938, 109, 87, 86, 107, 125, 126) // B 0.016 +XB_CRYSTAL(110, XB_TYPE_B, 46.357, 77.496, -46.296, 110, 88, 63, 87, 108, 126) // B 0.021 +XB_CRYSTAL(111, XB_TYPE_D, 36.000, 58.283, -121.717, 111, 89, 88, 109, 126, 127) // D 0.004 +XB_CRYSTAL(112, XB_TYPE_B, 30.325, 30.140, 172.011, 112, 90, 89, 110, 127, 128) // B 0.018 +XB_CRYSTAL(113, XB_TYPE_A, 31.717, 0.000, 270.000, 113, 90, 111, 128, 129, 162) // A 0.003 +XB_CRYSTAL(114, XB_TYPE_B, 30.325, -30.140, 7.989, 92, 91, 90, 112, 129, 130) // B 0.018 +XB_CRYSTAL(115, XB_TYPE_C, 54.015, -56.387, 178.886, 115, 94, 93, 92, 130, 131) // C 0.022 +XB_CRYSTAL(116, XB_TYPE_D, 72.000, -58.283, -121.717, 116, 95, 94, 114, 131, 132) // D 0.001 +XB_CRYSTAL(117, XB_TYPE_C, 90.000, -59.817, 0.000, 117, 96, 95, 115, 132, 133) // C 0.013 +XB_CRYSTAL(118, XB_TYPE_D, 108.000, -58.283, -58.283, 118, 97, 96, 116, 133, 134) // D 0.001 +XB_CRYSTAL(119, XB_TYPE_C, 125.985, -56.387, 181.114, 99, 98, 97, 117, 134, 135) // C 0.022 +XB_CRYSTAL(120, XB_TYPE_B, 149.675, -30.140, -7.989, 120, 101, 100, 99, 135, 136) // B 0.018 +XB_CRYSTAL(121, XB_TYPE_A, 148.283, 0.000, 90.000, 121, 101, 119, 136, 137, 162) // A 0.003 +XB_CRYSTAL(122, XB_TYPE_B, 149.675, 30.140, 187.989, 103, 102, 101, 120, 137, 138) // B 0.018 +XB_CRYSTAL(123, XB_TYPE_C, 125.985, 56.387, -1.114, 123, 105, 104, 103, 138, 139) // C 0.022 +XB_CRYSTAL(124, XB_TYPE_D, 108.000, 58.283, 58.283, 124, 106, 105, 122, 139, 140) // D 0.001 +XB_CRYSTAL(125, XB_TYPE_C, 90.000, 59.817, 180.000, 125, 107, 106, 123, 140, 141) // C 0.013 +XB_CRYSTAL(126, XB_TYPE_D, 72.000, 58.283, 121.717, 126, 108, 107, 124, 141, 142) // D 0.001 +XB_CRYSTAL(127, XB_TYPE_C, 54.015, 56.387, 1.114, 127, 110, 109, 108, 125, 142) // C 0.034 +XB_CRYSTAL(128, XB_TYPE_C, 47.634, 37.321, 132.588, 128, 111, 110, 126, 142, 143) // C 0.018 +XB_CRYSTAL(129, XB_TYPE_B, 45.050, 12.791, 115.890, 129, 112, 111, 127, 143, 144) // B 0.024 +XB_CRYSTAL(130, XB_TYPE_B, 45.050, -12.791, 64.110, 130, 113, 112, 128, 144, 145) // B 0.024 +XB_CRYSTAL(131, XB_TYPE_C, 47.634, -37.321, 47.412, 131, 114, 92, 113, 129, 145) // C 0.018 +XB_CRYSTAL(132, XB_TYPE_C, 63.388, -41.086, -69.780, 132, 115, 114, 130, 145, 146) // C 0.022 +XB_CRYSTAL(133, XB_TYPE_B, 80.986, -44.330, -35.002, 133, 116, 115, 131, 146, 147) // B 0.013 +XB_CRYSTAL(134, XB_TYPE_B, 99.014, -44.330, 35.002, 134, 117, 116, 132, 147, 148) // B 0.013 +XB_CRYSTAL(135, XB_TYPE_C, 116.612, -41.086, 69.780, 135, 118, 117, 133, 148, 149) // C 0.014 +XB_CRYSTAL(136, XB_TYPE_C, 132.366, -37.321, -47.412, 136, 119, 99, 118, 134, 149) // C 0.018 +XB_CRYSTAL(137, XB_TYPE_B, 134.950, -12.791, -64.110, 137, 120, 119, 135, 149, 150) // B 0.024 +XB_CRYSTAL(138, XB_TYPE_B, 134.950, 12.791, 244.110, 138, 121, 120, 136, 150, 151) // B 0.024 +XB_CRYSTAL(139, XB_TYPE_C, 132.366, 37.321, 227.412, 139, 122, 103, 121, 137, 151) // C 0.018 +XB_CRYSTAL(140, XB_TYPE_C, 116.612, 41.086, 110.220, 140, 123, 122, 138, 151, 152) // C 0.014 +XB_CRYSTAL(141, XB_TYPE_B, 99.014, 44.330, 144.998, 141, 124, 123, 139, 152, 153) // B 0.013 +XB_CRYSTAL(142, XB_TYPE_B, 80.986, 44.330, 215.002, 142, 125, 124, 140, 153, 154) // B 0.013 +XB_CRYSTAL(143, XB_TYPE_C, 63.388, 41.086, 249.780, 143, 127, 126, 125, 141, 154) // C 0.022 +XB_CRYSTAL(144, XB_TYPE_D, 60.000, 20.905, 20.905, 144, 128, 127, 142, 154, 155) // D 0.017 +XB_CRYSTAL(145, XB_TYPE_C, 59.817, 0.000, 90.000, 145, 129, 128, 143, 155, 156) // C 0.064 +XB_CRYSTAL(146, XB_TYPE_D, 60.000, -20.905, -20.905, 146, 131, 130, 129, 144, 156) // D 0.017 +XB_CRYSTAL(147, XB_TYPE_B, 75.314, -26.832, 251.370, 147, 132, 131, 145, 156, 157) // B 0.019 +XB_CRYSTAL(148, XB_TYPE_A, 90.000, -31.717, 180.000, 148, 133, 132, 146, 157, 162) // A 0.003 +XB_CRYSTAL(149, XB_TYPE_B, 104.686, -26.832, 108.630, 149, 134, 133, 147, 157, 158) // B 0.019 +XB_CRYSTAL(150, XB_TYPE_D, 120.000, -20.905, -159.095, 150, 136, 135, 134, 148, 158) // D 0.017 +XB_CRYSTAL(151, XB_TYPE_C, 120.183, 0.000, 270.000, 151, 137, 136, 149, 158, 159) // C 0.064 +XB_CRYSTAL(152, XB_TYPE_D, 120.000, 20.905, 159.095, 152, 139, 138, 137, 150, 159) // D 0.017 +XB_CRYSTAL(153, XB_TYPE_B, 104.686, 26.832, 71.370, 153, 140, 139, 151, 159, 160) // B 0.019 +XB_CRYSTAL(154, XB_TYPE_A, 90.000, 31.717, 0.000, 154, 141, 140, 152, 160, 162) // A 0.003 +XB_CRYSTAL(155, XB_TYPE_B, 75.314, 26.832, -71.370, 155, 143, 142, 141, 153, 160) // B 0.019 +XB_CRYSTAL(156, XB_TYPE_C, 73.928, 8.355, -32.656, 156, 144, 143, 154, 160, 161) // C 0.107 +XB_CRYSTAL(157, XB_TYPE_C, 73.928, -8.355, 212.656, 157, 146, 145, 144, 155, 161) // C 0.107 +XB_CRYSTAL(158, XB_TYPE_B, 90.000, -16.257, 180.000, 158, 148, 147, 146, 156, 161) // B 0.051 +XB_CRYSTAL(159, XB_TYPE_C, 106.072, -8.355, 147.344, 159, 150, 149, 148, 157, 161) // C 0.107 +XB_CRYSTAL(160, XB_TYPE_C, 106.072, 8.355, 32.656, 160, 152, 151, 150, 158, 161) // C 0.107 +XB_CRYSTAL(161, XB_TYPE_B, 90.000, 16.257, 0.000, 161, 155, 154, 153, 152, 159) // B 0.051 +XB_CRYSTAL(162, XB_TYPE_D, 90.000, 0.000, 90.000, 155, 156, 157, 158, 159, 160) // D 0.000 diff --git a/xball/xb_crystal_mod.hh b/xball/xb_crystal_mod.hh index 87f06ab52..57e652973 100644 --- a/xball/xb_crystal_mod.hh +++ b/xball/xb_crystal_mod.hh @@ -5,10 +5,10 @@ // Only "DISABLE" and "MOVE_R" command implemented // Syntax: XB_CRYSTAL_MOD( , , ) // -XB_CRYSTAL_MOD( 77, DISABLE, 0.0 ) // Disable crystal 86 -XB_CRYSTAL_MOD( 81, DISABLE, 0.0 ) // Disable crystal 81 -XB_CRYSTAL_MOD( 82, DISABLE, 0.0 ) // Disable crystal 82 -//XB_CRYSTAL_MOD( 60, MOVE_R, 4.0 ) // Move crystal 60 +4.0 cm in r -//XB_CRYSTAL_MOD( 62, MOVE_R, 4.0 ) // Move crystal 62 +4.0 cm in r -//XB_CRYSTAL_MOD( 90, MOVE_R, 4.0 ) // Move crystal 90 +4.0 cm in r -//XB_CRYSTAL_MOD( 92, MOVE_R, 4.0 ) // Move crystal 92 +4.0 cm in r +XB_CRYSTAL_MOD(77, DISABLE, 0.0) // Disable crystal 86 +XB_CRYSTAL_MOD(81, DISABLE, 0.0) // Disable crystal 81 +XB_CRYSTAL_MOD(82, DISABLE, 0.0) // Disable crystal 82 +// XB_CRYSTAL_MOD( 60, MOVE_R, 4.0 ) // Move crystal 60 +4.0 cm in r +// XB_CRYSTAL_MOD( 62, MOVE_R, 4.0 ) // Move crystal 62 +4.0 cm in r +// XB_CRYSTAL_MOD( 90, MOVE_R, 4.0 ) // Move crystal 90 +4.0 cm in r +// XB_CRYSTAL_MOD( 92, MOVE_R, 4.0 ) // Move crystal 92 +4.0 cm in r diff --git a/xball/xb_crystal_part.hh b/xball/xb_crystal_part.hh index f5ade8c34..174c5f500 100644 --- a/xball/xb_crystal_part.hh +++ b/xball/xb_crystal_part.hh @@ -6,15 +6,16 @@ // All values are in cm and are mesured om the frame with radious 49.86932985 cm // Syntax: , , , , , , , , // - 0.0, 9.06038, 8.61693, 2.79981, 5.32555, -7.33, 0.0, -7.33, //CrystalA1 - 0.0, -7.33, -5.32555, -7.33, -8.61693, 2.79981, 0.0, 9.06038, //CrystalA2 --9.60862, 0.0, -5.31000, 6.18700, 5.31000, 6.18700, 9.60862, 0.0, //CrystalB1_mod - 9.60862, 0.0, 4.33050, -7.42200, -4.33050, -7.42200, -9.60862, 0.0, //CrystalB2_mod - 0.0, -8.11689, -7.15389, -3.93231, -8.51298, 4.85925, 0.0, 8.09558, //CrystalC1 - 0.0, 8.09558, 8.51298, 4.85925, 7.15389, -3.93231, 0.0, -8.11689, //CrystalC2 - 0.0, -10.08625, -6.80000, -4.3305, -6.80000, 4.3305, 0.0, 10.08625, //CrystalD1 - 0.0, 10.08625, 6.80000, 4.3305, 6.80000, -4.3305, 0.0, -10.08625, //CrystalD2 +0.0, 9.06038, 8.61693, 2.79981, 5.32555, -7.33, 0.0, -7.33, // CrystalA1 + 0.0, -7.33, -5.32555, -7.33, -8.61693, 2.79981, 0.0, 9.06038, // CrystalA2 + -9.60862, 0.0, -5.31000, 6.18700, 5.31000, 6.18700, 9.60862, 0.0, // CrystalB1_mod + 9.60862, 0.0, 4.33050, -7.42200, -4.33050, -7.42200, -9.60862, 0.0, // CrystalB2_mod + 0.0, -8.11689, -7.15389, -3.93231, -8.51298, 4.85925, 0.0, 8.09558, // CrystalC1 + 0.0, 8.09558, 8.51298, 4.85925, 7.15389, -3.93231, 0.0, -8.11689, // CrystalC2 + 0.0, -10.08625, -6.80000, -4.3305, -6.80000, 4.3305, 0.0, 10.08625, // CrystalD1 + 0.0, 10.08625, 6.80000, 4.3305, 6.80000, -4.3305, 0.0, -10.08625, // CrystalD2 -// Original B crystal before modification (modification done because of overlapping B-B crystals in A-B-B combination) -//-9.60862, 0.0, -5.34300, 6.18700, 5.34300, 6.18700, 9.60862, 0.0, //CrystalB1_orig -// 9.60862, 0.0, 4.33050, -7.42200, -4.33050, -7.42200, -9.60862, 0.0, //CrystalB2_orig + // Original B crystal before modification (modification done because of overlapping B-B crystals in A-B-B + // combination) + //-9.60862, 0.0, -5.34300, 6.18700, 5.34300, 6.18700, 9.60862, 0.0, //CrystalB1_orig + // 9.60862, 0.0, 4.33050, -7.42200, -4.33050, -7.42200, -9.60862, 0.0, //CrystalB2_orig diff --git a/xball/xb_wrapping_loc.hh b/xball/xb_wrapping_loc.hh index 5e21a5e52..853049e01 100644 --- a/xball/xb_wrapping_loc.hh +++ b/xball/xb_wrapping_loc.hh @@ -5,165 +5,165 @@ // Angles in degrees // Syntax: XB_WRAPPING( , , , , , *, *, *, *, *, *) // -XB_WRAPPING( 1, XB_WTYPE_D, 90.000, 180.000, -90.000, 1, 2, 3, 4, 5, 6) // D 0.000 -XB_WRAPPING( 2, XB_WTYPE_B, 90.000,-163.743, 0.000, 0, 2, 6, 7, 8, 9) // B 0.051 -XB_WRAPPING( 3, XB_WTYPE_C, 73.928,-171.645, -32.656, 0, 1, 3, 9, 10, 11) // C 0.107 -XB_WRAPPING( 4, XB_WTYPE_C, 73.928, 171.645, 212.656, 0, 2, 4, 11, 12, 13) // C 0.107 -XB_WRAPPING( 5, XB_WTYPE_B, 90.000, 163.743, 180.000, 0, 3, 5, 13, 14, 15) // B 0.051 -XB_WRAPPING( 6, XB_WTYPE_C, 106.072, 171.645, 147.344, 0, 4, 6, 15, 16, 17) // C 0.107 -XB_WRAPPING( 7, XB_WTYPE_C, 106.072,-171.645, 32.656, 0, 1, 5, 7, 17, 18) // C 0.107 -XB_WRAPPING( 8, XB_WTYPE_B, 104.686,-153.168, 71.370, 1, 6, 8, 18, 19, 20) // B 0.019 -XB_WRAPPING( 9, XB_WTYPE_A, 90.000,-148.283, 0.000, 1, 7, 9, 20, 21,162) // A 0.003 -XB_WRAPPING( 10, XB_WTYPE_B, 75.314,-153.168, -71.370, 1, 2, 8, 10, 21, 22) // B 0.019 -XB_WRAPPING( 11, XB_WTYPE_D, 60.000,-159.095, 20.905, 9, 2, 11, 24, 23, 22) // D 0.017 -XB_WRAPPING( 12, XB_WTYPE_C, 59.817, 180.000, 90.000, 2, 3, 12, 25, 24, 10) // C 0.064 -XB_WRAPPING( 13, XB_WTYPE_D, 60.000, 159.095, -20.905, 3, 13, 27, 26, 25, 11) // D 0.017 -XB_WRAPPING( 14, XB_WTYPE_B, 75.314, 153.168, 251.370, 3, 4, 14, 28, 27, 12) // B 0.019 -XB_WRAPPING( 15, XB_WTYPE_A, 90.000, 148.283, 180.000, 4, 15, 29, 28, 13,162) // A 0.003 -XB_WRAPPING( 16, XB_WTYPE_B, 104.686, 153.168, 108.630, 4, 5, 16, 30, 29, 14) // B 0.019 -XB_WRAPPING( 17, XB_WTYPE_D, 120.000, 159.095,-159.095, 5, 17, 32, 31, 30, 15) // D 0.017 -XB_WRAPPING( 18, XB_WTYPE_C, 120.183, 180.000, 270.000, 5, 6, 18, 33, 32, 16) // C 0.064 -XB_WRAPPING( 19, XB_WTYPE_D, 120.000,-159.095, 159.095, 6, 7, 19, 34, 33, 17) // D 0.017 -XB_WRAPPING( 20, XB_WTYPE_C, 116.612,-138.914, 110.220, 7, 20, 36, 35, 34, 18) // C 0.022 -XB_WRAPPING( 21, XB_WTYPE_B, 99.014,-135.670, 144.998, 7, 8, 21, 37, 36, 19) // B 0.013 -XB_WRAPPING( 22, XB_WTYPE_B, 80.986,-135.670, 215.002, 8, 9, 22, 38, 37, 20) // B 0.013 -XB_WRAPPING( 23, XB_WTYPE_C, 63.388,-138.914, 249.780, 9, 10, 23, 39, 38, 21) // C 0.014 -XB_WRAPPING( 24, XB_WTYPE_C, 47.634,-142.679, 132.588, 10, 24, 40, 58, 39, 22) // C 0.018 -XB_WRAPPING( 25, XB_WTYPE_B, 45.050,-167.209, 115.890, 10, 11, 25, 41, 40, 23) // B 0.024 -XB_WRAPPING( 26, XB_WTYPE_B, 45.050, 167.209, 64.110, 11, 12, 26, 42, 41, 24) // B 0.024 -XB_WRAPPING( 27, XB_WTYPE_C, 47.634, 142.679, 47.412, 12, 27, 43, 62, 42, 25) // C 0.018 -XB_WRAPPING( 28, XB_WTYPE_C, 63.388, 138.914, -69.780, 12, 13, 28, 44, 43, 26) // C 0.014 -XB_WRAPPING( 29, XB_WTYPE_B, 80.986, 135.670, -35.002, 13, 14, 29, 45, 44, 27) // B 0.013 -XB_WRAPPING( 30, XB_WTYPE_B, 99.014, 135.670, 35.002, 14, 15, 30, 46, 45, 28) // B 0.013 -XB_WRAPPING( 31, XB_WTYPE_C, 116.612, 138.914, 69.780, 15, 16, 31, 47, 46, 29) // C 0.022 -XB_WRAPPING( 32, XB_WTYPE_C, 132.366, 142.679, -47.412, 16, 32, 48, 69, 47, 30) // C 0.018 -XB_WRAPPING( 33, XB_WTYPE_B, 134.950, 167.209, -64.110, 16, 17, 33, 49, 48, 31) // B 0.024 -XB_WRAPPING( 34, XB_WTYPE_B, 134.950,-167.209, 244.110, 17, 18, 34, 50, 49, 32) // B 0.024 -XB_WRAPPING( 35, XB_WTYPE_C, 132.366,-142.679, 227.412, 18, 19, 35, 51, 50, 33) // C 0.018 -XB_WRAPPING( 36, XB_WTYPE_C, 125.985,-123.613, -1.114, 19, 36, 53, 52, 51, 34) // C 0.020 -XB_WRAPPING( 37, XB_WTYPE_D, 108.000,-121.717, 58.283, 19, 20, 37, 54, 53, 35) // D 0.001 -XB_WRAPPING( 38, XB_WTYPE_C, 90.000,-120.183, 180.000, 20, 21, 38, 55, 54, 36) // C 0.013 -XB_WRAPPING( 39, XB_WTYPE_D, 72.000,-121.717, 121.717, 21, 22, 39, 56, 55, 37) // D 0.001 -XB_WRAPPING( 40, XB_WTYPE_C, 54.015,-123.613, 1.114, 22, 23, 58, 57, 56, 38) // C 0.022 -XB_WRAPPING( 41, XB_WTYPE_B, 30.325,-149.860, 172.011, 23, 24, 41, 60, 59, 58) // B 0.018 -XB_WRAPPING( 42, XB_WTYPE_A, 31.717, 180.000, -90.000, 24, 25, 42, 60, 40,162) // A 0.003 -XB_WRAPPING( 43, XB_WTYPE_B, 30.325, 149.860, 7.989, 25, 26, 62, 61, 60, 41) // B 0.018 -XB_WRAPPING( 44, XB_WTYPE_C, 54.015, 123.613, 178.886, 26, 27, 44, 64, 63, 62) // C 0.022 -XB_WRAPPING( 45, XB_WTYPE_D, 72.000, 121.717,-121.717, 27, 28, 45, 65, 64, 43) // D 0.001 -XB_WRAPPING( 46, XB_WTYPE_C, 90.000, 120.183, 0.000, 28, 29, 46, 66, 65, 44) // C 0.013 -XB_WRAPPING( 47, XB_WTYPE_D, 108.000, 121.717, -58.283, 29, 30, 47, 67, 66, 45) // D 0.001 -XB_WRAPPING( 48, XB_WTYPE_C, 125.985, 123.613, 181.114, 30, 31, 69, 68, 67, 46) // C 0.022 -XB_WRAPPING( 49, XB_WTYPE_B, 149.675, 149.860, -7.989, 31, 32, 49, 71, 70, 69) // B 0.018 -XB_WRAPPING( 50, XB_WTYPE_A, 148.283, 180.000, 90.000, 32, 33, 50, 71, 48,162) // A 0.003 -XB_WRAPPING( 51, XB_WTYPE_B, 149.675,-149.860, 187.989, 33, 34, 51, 72, 71, 49) // B 0.018 -XB_WRAPPING( 52, XB_WTYPE_D, 144.000,-121.717, -58.283, 34, 35, 52, 73, 72, 50) // D 0.004 -XB_WRAPPING( 53, XB_WTYPE_B, 133.643,-102.504, 46.296, 35, 53, 74, 98, 73, 51) // B 0.021 -XB_WRAPPING( 54, XB_WTYPE_B, 115.890,-106.368, -25.938, 35, 36, 54, 75, 74, 52) // B 0.016 -XB_WRAPPING( 55, XB_WTYPE_C, 98.026,-106.235, -59.672, 36, 37, 55, 76, 75, 53) // C 0.114 -XB_WRAPPING( 56, XB_WTYPE_C, 81.974,-106.235, 59.672, 37, 38, 56, 77, 76, 54) // C 0.114 -XB_WRAPPING( 57, XB_WTYPE_B, 64.110,-106.368, 25.938, 38, 39, 57, 78, 77, 55) // B 0.016 -XB_WRAPPING( 58, XB_WTYPE_B, 46.357,-102.504, -46.296, 39, 58, 79, 93, 78, 56) // B 0.021 -XB_WRAPPING( 59, XB_WTYPE_D, 36.000,-121.717,-121.717, 39, 23, 40, 59, 79, 57) // D 0.004 -XB_WRAPPING( 60, XB_WTYPE_C, 18.063,-116.764, 175.290, 40, 60, 80, 91, 79, 58) // C 0.114 -XB_WRAPPING( 61, XB_WTYPE_B, 16.257, 180.000, -90.000, 40, 41, 42, 61, 80, 59) // B 0.012 -XB_WRAPPING( 62, XB_WTYPE_C, 18.063, 116.764, 4.710, 42, 62, 88, 89, 80, 60) // C 0.114 -XB_WRAPPING( 63, XB_WTYPE_D, 36.000, 121.717, 121.717, 42, 26, 43, 63, 88, 61) // D 0.004 -XB_WRAPPING( 64, XB_WTYPE_B, 46.357, 102.504, 226.296, 43, 64, 87,109, 88, 62) // B 0.021 -XB_WRAPPING( 65, XB_WTYPE_B, 64.110, 106.368, 154.062, 43, 44, 65, 86, 87, 63) // B 0.016 -XB_WRAPPING( 66, XB_WTYPE_C, 81.974, 106.235, 120.328, 44, 45, 66, 85, 86, 64) // C 0.114 -XB_WRAPPING( 67, XB_WTYPE_C, 98.026, 106.235, 239.672, 45, 46, 67, 84, 85, 65) // C 0.114 -XB_WRAPPING( 68, XB_WTYPE_B, 115.890, 106.368, 205.938, 46, 47, 68, 83, 84, 66) // B 0.016 -XB_WRAPPING( 69, XB_WTYPE_B, 133.643, 102.504, 133.704, 47, 69, 82,104, 83, 67) // B 0.021 -XB_WRAPPING( 70, XB_WTYPE_D, 144.000, 121.717, 58.283, 47, 31, 48, 70, 82, 68) // D 0.004 -XB_WRAPPING( 71, XB_WTYPE_C, 161.937, 116.764, -4.710, 48, 71, 81,102, 82, 69) // C 0.114 -XB_WRAPPING( 72, XB_WTYPE_B, 163.743, 180.000, 90.000, 48, 49, 50, 72, 81, 70) // B 0.012 -XB_WRAPPING( 73, XB_WTYPE_C, 161.937,-116.764, 184.710, 50, 51, 73,100, 81, 71) // C 0.114 -XB_WRAPPING( 74, XB_WTYPE_C, 149.817, -90.000, 90.000, 51, 52, 98, 99,100, 72) // C 0.013 -XB_WRAPPING( 75, XB_WTYPE_A, 121.717, -90.000, -90.000, 52, 53, 75, 97, 98,162) // A 0.003 -XB_WRAPPING( 76, XB_WTYPE_B, 106.257, -90.000, -90.000, 53, 54, 76, 96, 97, 74) // B 0.051 -XB_WRAPPING( 77, XB_WTYPE_D, 90.000, -90.000, 180.000, 54, 55, 77, 95, 96, 75) // D 0.000 -XB_WRAPPING( 78, XB_WTYPE_B, 73.743, -90.000, 90.000, 55, 56, 78, 94, 95, 76) // B 0.051 -XB_WRAPPING( 79, XB_WTYPE_A, 58.283, -90.000, 90.000, 56, 57, 93, 94, 77,162) // A 0.003 -XB_WRAPPING( 80, XB_WTYPE_C, 30.183, -90.000, 270.000, 57, 58, 59, 91, 92, 93) // C 0.013 -XB_WRAPPING( 81, XB_WTYPE_D, 0.000, 0.000, 0.000, 59, 60, 61, 89, 90, 91) // D 0.000 -XB_WRAPPING( 82, XB_WTYPE_D, 180.000, 0.000, 180.000, 70, 71, 72,100,101,102) // D 0.000 -XB_WRAPPING( 83, XB_WTYPE_C, 149.817, 90.000, 90.000, 68, 69, 70,102,103,104) // C 0.013 -XB_WRAPPING( 84, XB_WTYPE_A, 121.717, 90.000, 270.000, 67, 68,104,105, 84,162) // A 0.003 -XB_WRAPPING( 85, XB_WTYPE_B, 106.257, 90.000, 270.000, 66, 67, 83,105,106, 85) // B 0.051 -XB_WRAPPING( 86, XB_WTYPE_D, 90.000, 90.000,-180.000, 65, 66, 84,106,107, 86) // D 0.000 -XB_WRAPPING( 87, XB_WTYPE_B, 73.743, 90.000, 90.000, 64, 65, 85,107,108, 87) // B 0.051 -XB_WRAPPING( 88, XB_WTYPE_A, 58.283, 90.000, 90.000, 63, 64, 86,108,109,162) // A 0.003 -XB_WRAPPING( 89, XB_WTYPE_C, 30.183, 90.000, -90.000, 61, 62, 63,109,110, 89) // C 0.013 -XB_WRAPPING( 90, XB_WTYPE_C, 18.063, 63.236, 175.290, 80, 61, 88,110,111, 90) // C 0.114 -XB_WRAPPING( 91, XB_WTYPE_B, 16.257, 0.000, 270.000, 91, 80, 89,111,112,113) // B 0.012 -XB_WRAPPING( 92, XB_WTYPE_C, 18.063, -63.236, 4.710, 79, 59, 80, 90,113, 92) // C 0.114 -XB_WRAPPING( 93, XB_WTYPE_D, 36.000, -58.283, 121.717, 93, 79, 91,113,130,114) // D 0.004 -XB_WRAPPING( 94, XB_WTYPE_B, 46.357, -77.496, 226.296, 94, 78, 57, 79, 92,114) // B 0.021 -XB_WRAPPING( 95, XB_WTYPE_B, 64.110, -73.632, 154.062, 95, 77, 78, 93,114,115) // B 0.016 -XB_WRAPPING( 96, XB_WTYPE_C, 81.974, -73.765, 120.328, 96, 76, 77, 94,115,116) // C 0.114 -XB_WRAPPING( 97, XB_WTYPE_C, 98.026, -73.765, 239.672, 97, 75, 76, 95,116,117) // C 0.114 -XB_WRAPPING( 98, XB_WTYPE_B, 115.890, -73.632, 205.938, 98, 74, 75, 96,117,118) // B 0.016 -XB_WRAPPING( 99, XB_WTYPE_B, 133.643, -77.496, 133.704, 99, 73, 52, 74, 97,118) // B 0.021 -XB_WRAPPING( 100, XB_WTYPE_D, 144.000, -58.283, 58.283,100, 73, 98,118,135,119) // D 0.004 -XB_WRAPPING( 101, XB_WTYPE_C, 161.937, -63.236, -4.710,101, 81, 72, 73, 99,119) // C 0.114 -XB_WRAPPING( 102, XB_WTYPE_B, 163.743, 0.000, 90.000,102, 81,100,119,120,121) // B 0.012 -XB_WRAPPING( 103, XB_WTYPE_C, 161.937, 63.236, 184.710,103, 82, 70, 81,101,121) // C 0.114 -XB_WRAPPING( 104, XB_WTYPE_D, 144.000, 58.283, -58.283,104, 82,102,121,138,122) // D 0.004 -XB_WRAPPING( 105, XB_WTYPE_B, 133.643, 77.496, 46.296,105, 83, 68, 82,103,122) // B 0.021 -XB_WRAPPING( 106, XB_WTYPE_B, 115.890, 73.632, -25.938,106, 84, 83,104,122,123) // B 0.016 -XB_WRAPPING( 107, XB_WTYPE_C, 98.026, 73.765, -59.672,107, 85, 84,105,123,124) // C 0.114 -XB_WRAPPING( 108, XB_WTYPE_C, 81.974, 73.765, 59.672,108, 86, 85,106,124,125) // C 0.114 -XB_WRAPPING( 109, XB_WTYPE_B, 64.110, 73.632, 25.938,109, 87, 86,107,125,126) // B 0.016 -XB_WRAPPING( 110, XB_WTYPE_B, 46.357, 77.496, -46.296,110, 88, 63, 87,108,126) // B 0.021 -XB_WRAPPING( 111, XB_WTYPE_D, 36.000, 58.283,-121.717,111, 89, 88,109,126,127) // D 0.004 -XB_WRAPPING( 112, XB_WTYPE_B, 30.325, 30.140, 172.011,112, 90, 89,110,127,128) // B 0.018 -XB_WRAPPING( 113, XB_WTYPE_A, 31.717, 0.000, 270.000,113, 90,111,128,129,162) // A 0.003 -XB_WRAPPING( 114, XB_WTYPE_B, 30.325, -30.140, 7.989, 92, 91, 90,112,129,130) // B 0.018 -XB_WRAPPING( 115, XB_WTYPE_C, 54.015, -56.387, 178.886,115, 94, 93, 92,130,131) // C 0.022 -XB_WRAPPING( 116, XB_WTYPE_D, 72.000, -58.283,-121.717,116, 95, 94,114,131,132) // D 0.001 -XB_WRAPPING( 117, XB_WTYPE_C, 90.000, -59.817, 0.000,117, 96, 95,115,132,133) // C 0.013 -XB_WRAPPING( 118, XB_WTYPE_D, 108.000, -58.283, -58.283,118, 97, 96,116,133,134) // D 0.001 -XB_WRAPPING( 119, XB_WTYPE_C, 125.985, -56.387, 181.114, 99, 98, 97,117,134,135) // C 0.022 -XB_WRAPPING( 120, XB_WTYPE_B, 149.675, -30.140, -7.989,120,101,100, 99,135,136) // B 0.018 -XB_WRAPPING( 121, XB_WTYPE_A, 148.283, 0.000, 90.000,121,101,119,136,137,162) // A 0.003 -XB_WRAPPING( 122, XB_WTYPE_B, 149.675, 30.140, 187.989,103,102,101,120,137,138) // B 0.018 -XB_WRAPPING( 123, XB_WTYPE_C, 125.985, 56.387, -1.114,123,105,104,103,138,139) // C 0.022 -XB_WRAPPING( 124, XB_WTYPE_D, 108.000, 58.283, 58.283,124,106,105,122,139,140) // D 0.001 -XB_WRAPPING( 125, XB_WTYPE_C, 90.000, 59.817, 180.000,125,107,106,123,140,141) // C 0.013 -XB_WRAPPING( 126, XB_WTYPE_D, 72.000, 58.283, 121.717,126,108,107,124,141,142) // D 0.001 -XB_WRAPPING( 127, XB_WTYPE_C, 54.015, 56.387, 1.114,127,110,109,108,125,142) // C 0.034 -XB_WRAPPING( 128, XB_WTYPE_C, 47.634, 37.321, 132.588,128,111,110,126,142,143) // C 0.018 -XB_WRAPPING( 129, XB_WTYPE_B, 45.050, 12.791, 115.890,129,112,111,127,143,144) // B 0.024 -XB_WRAPPING( 130, XB_WTYPE_B, 45.050, -12.791, 64.110,130,113,112,128,144,145) // B 0.024 -XB_WRAPPING( 131, XB_WTYPE_C, 47.634, -37.321, 47.412,131,114, 92,113,129,145) // C 0.018 -XB_WRAPPING( 132, XB_WTYPE_C, 63.388, -41.086, -69.780,132,115,114,130,145,146) // C 0.022 -XB_WRAPPING( 133, XB_WTYPE_B, 80.986, -44.330, -35.002,133,116,115,131,146,147) // B 0.013 -XB_WRAPPING( 134, XB_WTYPE_B, 99.014, -44.330, 35.002,134,117,116,132,147,148) // B 0.013 -XB_WRAPPING( 135, XB_WTYPE_C, 116.612, -41.086, 69.780,135,118,117,133,148,149) // C 0.014 -XB_WRAPPING( 136, XB_WTYPE_C, 132.366, -37.321, -47.412,136,119, 99,118,134,149) // C 0.018 -XB_WRAPPING( 137, XB_WTYPE_B, 134.950, -12.791, -64.110,137,120,119,135,149,150) // B 0.024 -XB_WRAPPING( 138, XB_WTYPE_B, 134.950, 12.791, 244.110,138,121,120,136,150,151) // B 0.024 -XB_WRAPPING( 139, XB_WTYPE_C, 132.366, 37.321, 227.412,139,122,103,121,137,151) // C 0.018 -XB_WRAPPING( 140, XB_WTYPE_C, 116.612, 41.086, 110.220,140,123,122,138,151,152) // C 0.014 -XB_WRAPPING( 141, XB_WTYPE_B, 99.014, 44.330, 144.998,141,124,123,139,152,153) // B 0.013 -XB_WRAPPING( 142, XB_WTYPE_B, 80.986, 44.330, 215.002,142,125,124,140,153,154) // B 0.013 -XB_WRAPPING( 143, XB_WTYPE_C, 63.388, 41.086, 249.780,143,127,126,125,141,154) // C 0.022 -XB_WRAPPING( 144, XB_WTYPE_D, 60.000, 20.905, 20.905,144,128,127,142,154,155) // D 0.017 -XB_WRAPPING( 145, XB_WTYPE_C, 59.817, 0.000, 90.000,145,129,128,143,155,156) // C 0.064 -XB_WRAPPING( 146, XB_WTYPE_D, 60.000, -20.905, -20.905,146,131,130,129,144,156) // D 0.017 -XB_WRAPPING( 147, XB_WTYPE_B, 75.314, -26.832, 251.370,147,132,131,145,156,157) // B 0.019 -XB_WRAPPING( 148, XB_WTYPE_A, 90.000, -31.717, 180.000,148,133,132,146,157,162) // A 0.003 -XB_WRAPPING( 149, XB_WTYPE_B, 104.686, -26.832, 108.630,149,134,133,147,157,158) // B 0.019 -XB_WRAPPING( 150, XB_WTYPE_D, 120.000, -20.905,-159.095,150,136,135,134,148,158) // D 0.017 -XB_WRAPPING( 151, XB_WTYPE_C, 120.183, 0.000, 270.000,151,137,136,149,158,159) // C 0.064 -XB_WRAPPING( 152, XB_WTYPE_D, 120.000, 20.905, 159.095,152,139,138,137,150,159) // D 0.017 -XB_WRAPPING( 153, XB_WTYPE_B, 104.686, 26.832, 71.370,153,140,139,151,159,160) // B 0.019 -XB_WRAPPING( 154, XB_WTYPE_A, 90.000, 31.717, 0.000,154,141,140,152,160,162) // A 0.003 -XB_WRAPPING( 155, XB_WTYPE_B, 75.314, 26.832, -71.370,155,143,142,141,153,160) // B 0.019 -XB_WRAPPING( 156, XB_WTYPE_C, 73.928, 8.355, -32.656,156,144,143,154,160,161) // C 0.107 -XB_WRAPPING( 157, XB_WTYPE_C, 73.928, -8.355, 212.656,157,146,145,144,155,161) // C 0.107 -XB_WRAPPING( 158, XB_WTYPE_B, 90.000, -16.257, 180.000,158,148,147,146,156,161) // B 0.051 -XB_WRAPPING( 159, XB_WTYPE_C, 106.072, -8.355, 147.344,159,150,149,148,157,161) // C 0.107 -XB_WRAPPING( 160, XB_WTYPE_C, 106.072, 8.355, 32.656,160,152,151,150,158,161) // C 0.107 -XB_WRAPPING( 161, XB_WTYPE_B, 90.000, 16.257, 0.000,161,155,154,153,152,159) // B 0.051 -XB_WRAPPING( 162, XB_WTYPE_D, 90.000, 0.000, 90.000,155,156,157,158,159,160) // D 0.000 +XB_WRAPPING(1, XB_WTYPE_D, 90.000, 180.000, -90.000, 1, 2, 3, 4, 5, 6) // D 0.000 +XB_WRAPPING(2, XB_WTYPE_B, 90.000, -163.743, 0.000, 0, 2, 6, 7, 8, 9) // B 0.051 +XB_WRAPPING(3, XB_WTYPE_C, 73.928, -171.645, -32.656, 0, 1, 3, 9, 10, 11) // C 0.107 +XB_WRAPPING(4, XB_WTYPE_C, 73.928, 171.645, 212.656, 0, 2, 4, 11, 12, 13) // C 0.107 +XB_WRAPPING(5, XB_WTYPE_B, 90.000, 163.743, 180.000, 0, 3, 5, 13, 14, 15) // B 0.051 +XB_WRAPPING(6, XB_WTYPE_C, 106.072, 171.645, 147.344, 0, 4, 6, 15, 16, 17) // C 0.107 +XB_WRAPPING(7, XB_WTYPE_C, 106.072, -171.645, 32.656, 0, 1, 5, 7, 17, 18) // C 0.107 +XB_WRAPPING(8, XB_WTYPE_B, 104.686, -153.168, 71.370, 1, 6, 8, 18, 19, 20) // B 0.019 +XB_WRAPPING(9, XB_WTYPE_A, 90.000, -148.283, 0.000, 1, 7, 9, 20, 21, 162) // A 0.003 +XB_WRAPPING(10, XB_WTYPE_B, 75.314, -153.168, -71.370, 1, 2, 8, 10, 21, 22) // B 0.019 +XB_WRAPPING(11, XB_WTYPE_D, 60.000, -159.095, 20.905, 9, 2, 11, 24, 23, 22) // D 0.017 +XB_WRAPPING(12, XB_WTYPE_C, 59.817, 180.000, 90.000, 2, 3, 12, 25, 24, 10) // C 0.064 +XB_WRAPPING(13, XB_WTYPE_D, 60.000, 159.095, -20.905, 3, 13, 27, 26, 25, 11) // D 0.017 +XB_WRAPPING(14, XB_WTYPE_B, 75.314, 153.168, 251.370, 3, 4, 14, 28, 27, 12) // B 0.019 +XB_WRAPPING(15, XB_WTYPE_A, 90.000, 148.283, 180.000, 4, 15, 29, 28, 13, 162) // A 0.003 +XB_WRAPPING(16, XB_WTYPE_B, 104.686, 153.168, 108.630, 4, 5, 16, 30, 29, 14) // B 0.019 +XB_WRAPPING(17, XB_WTYPE_D, 120.000, 159.095, -159.095, 5, 17, 32, 31, 30, 15) // D 0.017 +XB_WRAPPING(18, XB_WTYPE_C, 120.183, 180.000, 270.000, 5, 6, 18, 33, 32, 16) // C 0.064 +XB_WRAPPING(19, XB_WTYPE_D, 120.000, -159.095, 159.095, 6, 7, 19, 34, 33, 17) // D 0.017 +XB_WRAPPING(20, XB_WTYPE_C, 116.612, -138.914, 110.220, 7, 20, 36, 35, 34, 18) // C 0.022 +XB_WRAPPING(21, XB_WTYPE_B, 99.014, -135.670, 144.998, 7, 8, 21, 37, 36, 19) // B 0.013 +XB_WRAPPING(22, XB_WTYPE_B, 80.986, -135.670, 215.002, 8, 9, 22, 38, 37, 20) // B 0.013 +XB_WRAPPING(23, XB_WTYPE_C, 63.388, -138.914, 249.780, 9, 10, 23, 39, 38, 21) // C 0.014 +XB_WRAPPING(24, XB_WTYPE_C, 47.634, -142.679, 132.588, 10, 24, 40, 58, 39, 22) // C 0.018 +XB_WRAPPING(25, XB_WTYPE_B, 45.050, -167.209, 115.890, 10, 11, 25, 41, 40, 23) // B 0.024 +XB_WRAPPING(26, XB_WTYPE_B, 45.050, 167.209, 64.110, 11, 12, 26, 42, 41, 24) // B 0.024 +XB_WRAPPING(27, XB_WTYPE_C, 47.634, 142.679, 47.412, 12, 27, 43, 62, 42, 25) // C 0.018 +XB_WRAPPING(28, XB_WTYPE_C, 63.388, 138.914, -69.780, 12, 13, 28, 44, 43, 26) // C 0.014 +XB_WRAPPING(29, XB_WTYPE_B, 80.986, 135.670, -35.002, 13, 14, 29, 45, 44, 27) // B 0.013 +XB_WRAPPING(30, XB_WTYPE_B, 99.014, 135.670, 35.002, 14, 15, 30, 46, 45, 28) // B 0.013 +XB_WRAPPING(31, XB_WTYPE_C, 116.612, 138.914, 69.780, 15, 16, 31, 47, 46, 29) // C 0.022 +XB_WRAPPING(32, XB_WTYPE_C, 132.366, 142.679, -47.412, 16, 32, 48, 69, 47, 30) // C 0.018 +XB_WRAPPING(33, XB_WTYPE_B, 134.950, 167.209, -64.110, 16, 17, 33, 49, 48, 31) // B 0.024 +XB_WRAPPING(34, XB_WTYPE_B, 134.950, -167.209, 244.110, 17, 18, 34, 50, 49, 32) // B 0.024 +XB_WRAPPING(35, XB_WTYPE_C, 132.366, -142.679, 227.412, 18, 19, 35, 51, 50, 33) // C 0.018 +XB_WRAPPING(36, XB_WTYPE_C, 125.985, -123.613, -1.114, 19, 36, 53, 52, 51, 34) // C 0.020 +XB_WRAPPING(37, XB_WTYPE_D, 108.000, -121.717, 58.283, 19, 20, 37, 54, 53, 35) // D 0.001 +XB_WRAPPING(38, XB_WTYPE_C, 90.000, -120.183, 180.000, 20, 21, 38, 55, 54, 36) // C 0.013 +XB_WRAPPING(39, XB_WTYPE_D, 72.000, -121.717, 121.717, 21, 22, 39, 56, 55, 37) // D 0.001 +XB_WRAPPING(40, XB_WTYPE_C, 54.015, -123.613, 1.114, 22, 23, 58, 57, 56, 38) // C 0.022 +XB_WRAPPING(41, XB_WTYPE_B, 30.325, -149.860, 172.011, 23, 24, 41, 60, 59, 58) // B 0.018 +XB_WRAPPING(42, XB_WTYPE_A, 31.717, 180.000, -90.000, 24, 25, 42, 60, 40, 162) // A 0.003 +XB_WRAPPING(43, XB_WTYPE_B, 30.325, 149.860, 7.989, 25, 26, 62, 61, 60, 41) // B 0.018 +XB_WRAPPING(44, XB_WTYPE_C, 54.015, 123.613, 178.886, 26, 27, 44, 64, 63, 62) // C 0.022 +XB_WRAPPING(45, XB_WTYPE_D, 72.000, 121.717, -121.717, 27, 28, 45, 65, 64, 43) // D 0.001 +XB_WRAPPING(46, XB_WTYPE_C, 90.000, 120.183, 0.000, 28, 29, 46, 66, 65, 44) // C 0.013 +XB_WRAPPING(47, XB_WTYPE_D, 108.000, 121.717, -58.283, 29, 30, 47, 67, 66, 45) // D 0.001 +XB_WRAPPING(48, XB_WTYPE_C, 125.985, 123.613, 181.114, 30, 31, 69, 68, 67, 46) // C 0.022 +XB_WRAPPING(49, XB_WTYPE_B, 149.675, 149.860, -7.989, 31, 32, 49, 71, 70, 69) // B 0.018 +XB_WRAPPING(50, XB_WTYPE_A, 148.283, 180.000, 90.000, 32, 33, 50, 71, 48, 162) // A 0.003 +XB_WRAPPING(51, XB_WTYPE_B, 149.675, -149.860, 187.989, 33, 34, 51, 72, 71, 49) // B 0.018 +XB_WRAPPING(52, XB_WTYPE_D, 144.000, -121.717, -58.283, 34, 35, 52, 73, 72, 50) // D 0.004 +XB_WRAPPING(53, XB_WTYPE_B, 133.643, -102.504, 46.296, 35, 53, 74, 98, 73, 51) // B 0.021 +XB_WRAPPING(54, XB_WTYPE_B, 115.890, -106.368, -25.938, 35, 36, 54, 75, 74, 52) // B 0.016 +XB_WRAPPING(55, XB_WTYPE_C, 98.026, -106.235, -59.672, 36, 37, 55, 76, 75, 53) // C 0.114 +XB_WRAPPING(56, XB_WTYPE_C, 81.974, -106.235, 59.672, 37, 38, 56, 77, 76, 54) // C 0.114 +XB_WRAPPING(57, XB_WTYPE_B, 64.110, -106.368, 25.938, 38, 39, 57, 78, 77, 55) // B 0.016 +XB_WRAPPING(58, XB_WTYPE_B, 46.357, -102.504, -46.296, 39, 58, 79, 93, 78, 56) // B 0.021 +XB_WRAPPING(59, XB_WTYPE_D, 36.000, -121.717, -121.717, 39, 23, 40, 59, 79, 57) // D 0.004 +XB_WRAPPING(60, XB_WTYPE_C, 18.063, -116.764, 175.290, 40, 60, 80, 91, 79, 58) // C 0.114 +XB_WRAPPING(61, XB_WTYPE_B, 16.257, 180.000, -90.000, 40, 41, 42, 61, 80, 59) // B 0.012 +XB_WRAPPING(62, XB_WTYPE_C, 18.063, 116.764, 4.710, 42, 62, 88, 89, 80, 60) // C 0.114 +XB_WRAPPING(63, XB_WTYPE_D, 36.000, 121.717, 121.717, 42, 26, 43, 63, 88, 61) // D 0.004 +XB_WRAPPING(64, XB_WTYPE_B, 46.357, 102.504, 226.296, 43, 64, 87, 109, 88, 62) // B 0.021 +XB_WRAPPING(65, XB_WTYPE_B, 64.110, 106.368, 154.062, 43, 44, 65, 86, 87, 63) // B 0.016 +XB_WRAPPING(66, XB_WTYPE_C, 81.974, 106.235, 120.328, 44, 45, 66, 85, 86, 64) // C 0.114 +XB_WRAPPING(67, XB_WTYPE_C, 98.026, 106.235, 239.672, 45, 46, 67, 84, 85, 65) // C 0.114 +XB_WRAPPING(68, XB_WTYPE_B, 115.890, 106.368, 205.938, 46, 47, 68, 83, 84, 66) // B 0.016 +XB_WRAPPING(69, XB_WTYPE_B, 133.643, 102.504, 133.704, 47, 69, 82, 104, 83, 67) // B 0.021 +XB_WRAPPING(70, XB_WTYPE_D, 144.000, 121.717, 58.283, 47, 31, 48, 70, 82, 68) // D 0.004 +XB_WRAPPING(71, XB_WTYPE_C, 161.937, 116.764, -4.710, 48, 71, 81, 102, 82, 69) // C 0.114 +XB_WRAPPING(72, XB_WTYPE_B, 163.743, 180.000, 90.000, 48, 49, 50, 72, 81, 70) // B 0.012 +XB_WRAPPING(73, XB_WTYPE_C, 161.937, -116.764, 184.710, 50, 51, 73, 100, 81, 71) // C 0.114 +XB_WRAPPING(74, XB_WTYPE_C, 149.817, -90.000, 90.000, 51, 52, 98, 99, 100, 72) // C 0.013 +XB_WRAPPING(75, XB_WTYPE_A, 121.717, -90.000, -90.000, 52, 53, 75, 97, 98, 162) // A 0.003 +XB_WRAPPING(76, XB_WTYPE_B, 106.257, -90.000, -90.000, 53, 54, 76, 96, 97, 74) // B 0.051 +XB_WRAPPING(77, XB_WTYPE_D, 90.000, -90.000, 180.000, 54, 55, 77, 95, 96, 75) // D 0.000 +XB_WRAPPING(78, XB_WTYPE_B, 73.743, -90.000, 90.000, 55, 56, 78, 94, 95, 76) // B 0.051 +XB_WRAPPING(79, XB_WTYPE_A, 58.283, -90.000, 90.000, 56, 57, 93, 94, 77, 162) // A 0.003 +XB_WRAPPING(80, XB_WTYPE_C, 30.183, -90.000, 270.000, 57, 58, 59, 91, 92, 93) // C 0.013 +XB_WRAPPING(81, XB_WTYPE_D, 0.000, 0.000, 0.000, 59, 60, 61, 89, 90, 91) // D 0.000 +XB_WRAPPING(82, XB_WTYPE_D, 180.000, 0.000, 180.000, 70, 71, 72, 100, 101, 102) // D 0.000 +XB_WRAPPING(83, XB_WTYPE_C, 149.817, 90.000, 90.000, 68, 69, 70, 102, 103, 104) // C 0.013 +XB_WRAPPING(84, XB_WTYPE_A, 121.717, 90.000, 270.000, 67, 68, 104, 105, 84, 162) // A 0.003 +XB_WRAPPING(85, XB_WTYPE_B, 106.257, 90.000, 270.000, 66, 67, 83, 105, 106, 85) // B 0.051 +XB_WRAPPING(86, XB_WTYPE_D, 90.000, 90.000, -180.000, 65, 66, 84, 106, 107, 86) // D 0.000 +XB_WRAPPING(87, XB_WTYPE_B, 73.743, 90.000, 90.000, 64, 65, 85, 107, 108, 87) // B 0.051 +XB_WRAPPING(88, XB_WTYPE_A, 58.283, 90.000, 90.000, 63, 64, 86, 108, 109, 162) // A 0.003 +XB_WRAPPING(89, XB_WTYPE_C, 30.183, 90.000, -90.000, 61, 62, 63, 109, 110, 89) // C 0.013 +XB_WRAPPING(90, XB_WTYPE_C, 18.063, 63.236, 175.290, 80, 61, 88, 110, 111, 90) // C 0.114 +XB_WRAPPING(91, XB_WTYPE_B, 16.257, 0.000, 270.000, 91, 80, 89, 111, 112, 113) // B 0.012 +XB_WRAPPING(92, XB_WTYPE_C, 18.063, -63.236, 4.710, 79, 59, 80, 90, 113, 92) // C 0.114 +XB_WRAPPING(93, XB_WTYPE_D, 36.000, -58.283, 121.717, 93, 79, 91, 113, 130, 114) // D 0.004 +XB_WRAPPING(94, XB_WTYPE_B, 46.357, -77.496, 226.296, 94, 78, 57, 79, 92, 114) // B 0.021 +XB_WRAPPING(95, XB_WTYPE_B, 64.110, -73.632, 154.062, 95, 77, 78, 93, 114, 115) // B 0.016 +XB_WRAPPING(96, XB_WTYPE_C, 81.974, -73.765, 120.328, 96, 76, 77, 94, 115, 116) // C 0.114 +XB_WRAPPING(97, XB_WTYPE_C, 98.026, -73.765, 239.672, 97, 75, 76, 95, 116, 117) // C 0.114 +XB_WRAPPING(98, XB_WTYPE_B, 115.890, -73.632, 205.938, 98, 74, 75, 96, 117, 118) // B 0.016 +XB_WRAPPING(99, XB_WTYPE_B, 133.643, -77.496, 133.704, 99, 73, 52, 74, 97, 118) // B 0.021 +XB_WRAPPING(100, XB_WTYPE_D, 144.000, -58.283, 58.283, 100, 73, 98, 118, 135, 119) // D 0.004 +XB_WRAPPING(101, XB_WTYPE_C, 161.937, -63.236, -4.710, 101, 81, 72, 73, 99, 119) // C 0.114 +XB_WRAPPING(102, XB_WTYPE_B, 163.743, 0.000, 90.000, 102, 81, 100, 119, 120, 121) // B 0.012 +XB_WRAPPING(103, XB_WTYPE_C, 161.937, 63.236, 184.710, 103, 82, 70, 81, 101, 121) // C 0.114 +XB_WRAPPING(104, XB_WTYPE_D, 144.000, 58.283, -58.283, 104, 82, 102, 121, 138, 122) // D 0.004 +XB_WRAPPING(105, XB_WTYPE_B, 133.643, 77.496, 46.296, 105, 83, 68, 82, 103, 122) // B 0.021 +XB_WRAPPING(106, XB_WTYPE_B, 115.890, 73.632, -25.938, 106, 84, 83, 104, 122, 123) // B 0.016 +XB_WRAPPING(107, XB_WTYPE_C, 98.026, 73.765, -59.672, 107, 85, 84, 105, 123, 124) // C 0.114 +XB_WRAPPING(108, XB_WTYPE_C, 81.974, 73.765, 59.672, 108, 86, 85, 106, 124, 125) // C 0.114 +XB_WRAPPING(109, XB_WTYPE_B, 64.110, 73.632, 25.938, 109, 87, 86, 107, 125, 126) // B 0.016 +XB_WRAPPING(110, XB_WTYPE_B, 46.357, 77.496, -46.296, 110, 88, 63, 87, 108, 126) // B 0.021 +XB_WRAPPING(111, XB_WTYPE_D, 36.000, 58.283, -121.717, 111, 89, 88, 109, 126, 127) // D 0.004 +XB_WRAPPING(112, XB_WTYPE_B, 30.325, 30.140, 172.011, 112, 90, 89, 110, 127, 128) // B 0.018 +XB_WRAPPING(113, XB_WTYPE_A, 31.717, 0.000, 270.000, 113, 90, 111, 128, 129, 162) // A 0.003 +XB_WRAPPING(114, XB_WTYPE_B, 30.325, -30.140, 7.989, 92, 91, 90, 112, 129, 130) // B 0.018 +XB_WRAPPING(115, XB_WTYPE_C, 54.015, -56.387, 178.886, 115, 94, 93, 92, 130, 131) // C 0.022 +XB_WRAPPING(116, XB_WTYPE_D, 72.000, -58.283, -121.717, 116, 95, 94, 114, 131, 132) // D 0.001 +XB_WRAPPING(117, XB_WTYPE_C, 90.000, -59.817, 0.000, 117, 96, 95, 115, 132, 133) // C 0.013 +XB_WRAPPING(118, XB_WTYPE_D, 108.000, -58.283, -58.283, 118, 97, 96, 116, 133, 134) // D 0.001 +XB_WRAPPING(119, XB_WTYPE_C, 125.985, -56.387, 181.114, 99, 98, 97, 117, 134, 135) // C 0.022 +XB_WRAPPING(120, XB_WTYPE_B, 149.675, -30.140, -7.989, 120, 101, 100, 99, 135, 136) // B 0.018 +XB_WRAPPING(121, XB_WTYPE_A, 148.283, 0.000, 90.000, 121, 101, 119, 136, 137, 162) // A 0.003 +XB_WRAPPING(122, XB_WTYPE_B, 149.675, 30.140, 187.989, 103, 102, 101, 120, 137, 138) // B 0.018 +XB_WRAPPING(123, XB_WTYPE_C, 125.985, 56.387, -1.114, 123, 105, 104, 103, 138, 139) // C 0.022 +XB_WRAPPING(124, XB_WTYPE_D, 108.000, 58.283, 58.283, 124, 106, 105, 122, 139, 140) // D 0.001 +XB_WRAPPING(125, XB_WTYPE_C, 90.000, 59.817, 180.000, 125, 107, 106, 123, 140, 141) // C 0.013 +XB_WRAPPING(126, XB_WTYPE_D, 72.000, 58.283, 121.717, 126, 108, 107, 124, 141, 142) // D 0.001 +XB_WRAPPING(127, XB_WTYPE_C, 54.015, 56.387, 1.114, 127, 110, 109, 108, 125, 142) // C 0.034 +XB_WRAPPING(128, XB_WTYPE_C, 47.634, 37.321, 132.588, 128, 111, 110, 126, 142, 143) // C 0.018 +XB_WRAPPING(129, XB_WTYPE_B, 45.050, 12.791, 115.890, 129, 112, 111, 127, 143, 144) // B 0.024 +XB_WRAPPING(130, XB_WTYPE_B, 45.050, -12.791, 64.110, 130, 113, 112, 128, 144, 145) // B 0.024 +XB_WRAPPING(131, XB_WTYPE_C, 47.634, -37.321, 47.412, 131, 114, 92, 113, 129, 145) // C 0.018 +XB_WRAPPING(132, XB_WTYPE_C, 63.388, -41.086, -69.780, 132, 115, 114, 130, 145, 146) // C 0.022 +XB_WRAPPING(133, XB_WTYPE_B, 80.986, -44.330, -35.002, 133, 116, 115, 131, 146, 147) // B 0.013 +XB_WRAPPING(134, XB_WTYPE_B, 99.014, -44.330, 35.002, 134, 117, 116, 132, 147, 148) // B 0.013 +XB_WRAPPING(135, XB_WTYPE_C, 116.612, -41.086, 69.780, 135, 118, 117, 133, 148, 149) // C 0.014 +XB_WRAPPING(136, XB_WTYPE_C, 132.366, -37.321, -47.412, 136, 119, 99, 118, 134, 149) // C 0.018 +XB_WRAPPING(137, XB_WTYPE_B, 134.950, -12.791, -64.110, 137, 120, 119, 135, 149, 150) // B 0.024 +XB_WRAPPING(138, XB_WTYPE_B, 134.950, 12.791, 244.110, 138, 121, 120, 136, 150, 151) // B 0.024 +XB_WRAPPING(139, XB_WTYPE_C, 132.366, 37.321, 227.412, 139, 122, 103, 121, 137, 151) // C 0.018 +XB_WRAPPING(140, XB_WTYPE_C, 116.612, 41.086, 110.220, 140, 123, 122, 138, 151, 152) // C 0.014 +XB_WRAPPING(141, XB_WTYPE_B, 99.014, 44.330, 144.998, 141, 124, 123, 139, 152, 153) // B 0.013 +XB_WRAPPING(142, XB_WTYPE_B, 80.986, 44.330, 215.002, 142, 125, 124, 140, 153, 154) // B 0.013 +XB_WRAPPING(143, XB_WTYPE_C, 63.388, 41.086, 249.780, 143, 127, 126, 125, 141, 154) // C 0.022 +XB_WRAPPING(144, XB_WTYPE_D, 60.000, 20.905, 20.905, 144, 128, 127, 142, 154, 155) // D 0.017 +XB_WRAPPING(145, XB_WTYPE_C, 59.817, 0.000, 90.000, 145, 129, 128, 143, 155, 156) // C 0.064 +XB_WRAPPING(146, XB_WTYPE_D, 60.000, -20.905, -20.905, 146, 131, 130, 129, 144, 156) // D 0.017 +XB_WRAPPING(147, XB_WTYPE_B, 75.314, -26.832, 251.370, 147, 132, 131, 145, 156, 157) // B 0.019 +XB_WRAPPING(148, XB_WTYPE_A, 90.000, -31.717, 180.000, 148, 133, 132, 146, 157, 162) // A 0.003 +XB_WRAPPING(149, XB_WTYPE_B, 104.686, -26.832, 108.630, 149, 134, 133, 147, 157, 158) // B 0.019 +XB_WRAPPING(150, XB_WTYPE_D, 120.000, -20.905, -159.095, 150, 136, 135, 134, 148, 158) // D 0.017 +XB_WRAPPING(151, XB_WTYPE_C, 120.183, 0.000, 270.000, 151, 137, 136, 149, 158, 159) // C 0.064 +XB_WRAPPING(152, XB_WTYPE_D, 120.000, 20.905, 159.095, 152, 139, 138, 137, 150, 159) // D 0.017 +XB_WRAPPING(153, XB_WTYPE_B, 104.686, 26.832, 71.370, 153, 140, 139, 151, 159, 160) // B 0.019 +XB_WRAPPING(154, XB_WTYPE_A, 90.000, 31.717, 0.000, 154, 141, 140, 152, 160, 162) // A 0.003 +XB_WRAPPING(155, XB_WTYPE_B, 75.314, 26.832, -71.370, 155, 143, 142, 141, 153, 160) // B 0.019 +XB_WRAPPING(156, XB_WTYPE_C, 73.928, 8.355, -32.656, 156, 144, 143, 154, 160, 161) // C 0.107 +XB_WRAPPING(157, XB_WTYPE_C, 73.928, -8.355, 212.656, 157, 146, 145, 144, 155, 161) // C 0.107 +XB_WRAPPING(158, XB_WTYPE_B, 90.000, -16.257, 180.000, 158, 148, 147, 146, 156, 161) // B 0.051 +XB_WRAPPING(159, XB_WTYPE_C, 106.072, -8.355, 147.344, 159, 150, 149, 148, 157, 161) // C 0.107 +XB_WRAPPING(160, XB_WTYPE_C, 106.072, 8.355, 32.656, 160, 152, 151, 150, 158, 161) // C 0.107 +XB_WRAPPING(161, XB_WTYPE_B, 90.000, 16.257, 0.000, 161, 155, 154, 153, 152, 159) // B 0.051 +XB_WRAPPING(162, XB_WTYPE_D, 90.000, 0.000, 90.000, 155, 156, 157, 158, 159, 160) // D 0.000 diff --git a/xball/xb_wrapping_mod.hh b/xball/xb_wrapping_mod.hh index c0c788d80..953c58e35 100644 --- a/xball/xb_wrapping_mod.hh +++ b/xball/xb_wrapping_mod.hh @@ -4,10 +4,10 @@ // Only "WDISABLE" and "WMOVE_R" command implemented // Syntax: XB_WRAPPING_MOD( , , ) // -XB_WRAPPING_MOD( 77, WDISABLE, 0.0 ) // Disable wrapping 86 -XB_WRAPPING_MOD( 81, WDISABLE, 0.0 ) // Disable wrapping 81 -XB_WRAPPING_MOD( 82, WDISABLE, 0.0 ) // Disable wrapping 82 -//XB_WRAPPING_MOD( 60, WMOVE_R, 4.0 ) // Move wrapping 60 +4.0 cm in r -//XB_WRAPPING_MOD( 62, WMOVE_R, 4.0 ) // Move wrapping 62 +4.0 cm in r -//XB_WRAPPING_MOD( 90, WMOVE_R, 4.0 ) // Move wrapping 90 +4.0 cm in r -//XB_WRAPPING_MOD( 92, WMOVE_R, 4.0 ) // Move wrapping 92 +4.0 cm in r +XB_WRAPPING_MOD(77, WDISABLE, 0.0) // Disable wrapping 86 +XB_WRAPPING_MOD(81, WDISABLE, 0.0) // Disable wrapping 81 +XB_WRAPPING_MOD(82, WDISABLE, 0.0) // Disable wrapping 82 +// XB_WRAPPING_MOD( 60, WMOVE_R, 4.0 ) // Move wrapping 60 +4.0 cm in r +// XB_WRAPPING_MOD( 62, WMOVE_R, 4.0 ) // Move wrapping 62 +4.0 cm in r +// XB_WRAPPING_MOD( 90, WMOVE_R, 4.0 ) // Move wrapping 90 +4.0 cm in r +// XB_WRAPPING_MOD( 92, WMOVE_R, 4.0 ) // Move wrapping 92 +4.0 cm in r diff --git a/xball/xb_wrapping_part.hh b/xball/xb_wrapping_part.hh index 3f403e1ca..5b0fbf97a 100644 --- a/xball/xb_wrapping_part.hh +++ b/xball/xb_wrapping_part.hh @@ -5,15 +5,16 @@ // All values are in cm and are mesured om the frame with radious 49.86932985 cm // Syntax: , , , , , , , , // - 0.0, 9.06038, 8.61693, 2.79981, 5.32555, -7.33, 0.0, -7.33, //WrappingA1 - 0.0, -7.33, -5.32555, -7.33, -8.61693, 2.79981, 0.0, 9.06038, //WrappingA2 --9.60862, 0.0, -5.31000, 6.18700, 5.31000, 6.18700, 9.60862, 0.0, //WrappingB1_mod - 9.60862, 0.0, 4.33050, -7.42200, -4.33050, -7.42200, -9.60862, 0.0, //WrappingB2_mod - 0.0, -8.11689, -7.15389, -3.93231, -8.51298, 4.85925, 0.0, 8.09558, //WrappingC1 - 0.0, 8.09558, 8.51298, 4.85925, 7.15389, -3.93231, 0.0, -8.11689, //WrappingC2 - 0.0, -10.08625, -6.80000, -4.3305, -6.80000, 4.3305, 0.0, 10.08625, //WrappingD1 - 0.0, 10.08625, 6.80000, 4.3305, 6.80000, -4.3305, 0.0, -10.08625, //WrappingD2 +0.0, 9.06038, 8.61693, 2.79981, 5.32555, -7.33, 0.0, -7.33, // WrappingA1 + 0.0, -7.33, -5.32555, -7.33, -8.61693, 2.79981, 0.0, 9.06038, // WrappingA2 + -9.60862, 0.0, -5.31000, 6.18700, 5.31000, 6.18700, 9.60862, 0.0, // WrappingB1_mod + 9.60862, 0.0, 4.33050, -7.42200, -4.33050, -7.42200, -9.60862, 0.0, // WrappingB2_mod + 0.0, -8.11689, -7.15389, -3.93231, -8.51298, 4.85925, 0.0, 8.09558, // WrappingC1 + 0.0, 8.09558, 8.51298, 4.85925, 7.15389, -3.93231, 0.0, -8.11689, // WrappingC2 + 0.0, -10.08625, -6.80000, -4.3305, -6.80000, 4.3305, 0.0, 10.08625, // WrappingD1 + 0.0, 10.08625, 6.80000, 4.3305, 6.80000, -4.3305, 0.0, -10.08625, // WrappingD2 -// Original B wrapping before modification (modification done because of overlapping B-B wrappings in A-B-B combination) -//-9.60862, 0.0, -5.34300, 6.18700, 5.34300, 6.18700, 9.60862, 0.0, //WrappingB1_orig -// 9.60862, 0.0, 4.33050, -7.42200, -4.33050, -7.42200, -9.60862, 0.0, //WrappingB2_orig + // Original B wrapping before modification (modification done because of overlapping B-B wrappings in A-B-B + // combination) + //-9.60862, 0.0, -5.34300, 6.18700, 5.34300, 6.18700, 9.60862, 0.0, //WrappingB1_orig + // 9.60862, 0.0, 4.33050, -7.42200, -4.33050, -7.42200, -9.60862, 0.0, //WrappingB2_orig