Commit 7633560a authored by Alexandru Bercuci's avatar Alexandru Bercuci
Browse files

fix format

parent e99296c6
......@@ -233,7 +233,7 @@ void CbmTrdGeoHandler::NavigateTo(const TString& path)
TString nDaughter(modulenode->GetDaughter(i)->GetName());
if (!nDaughter.BeginsWith("radiator") && !nDaughter.BeginsWith("Radiator")) continue;
fRadiatorType = 0;
// TODO define radiator (+ entrance window) types according to the naming convention
// TODO define radiator (+ entrance window) types according to the naming convention
}
}
else // 2013 and earlier
......
......@@ -105,7 +105,7 @@ private:
Int_t fLayerId; //!
Int_t fModuleId; //!
Int_t fModuleType; //!
Int_t fRadiatorType; //! radiator + chamber entrance window type
Int_t fRadiatorType; //! radiator + chamber entrance window type
Int_t fRotation; //! rotation angle 0,1,2,3
// for backward compatibility
......
......@@ -414,8 +414,8 @@ Double_t asic_distance;
//const Double_t FrameWidth[2] = { 1.5, 2.0 }; // Width of detector frames in cm
const Double_t FrameWidth[4] = {1.5, 1.5, 2.5, 1.5}; // Width of detector frames in cm
// mini - production
const Double_t DetectorSizeX[4] = {57., 95., 59.0, 23.04 + 3.}; // => 54 x 54 cm2 & 91 x 91 cm2 active area
const Double_t DetectorSizeY[4] = {57., 95., 60.8, 8.16 + 3.}; // quadratic modules
const Double_t DetectorSizeX[4] = {57., 95., 59.0, 23.04 + 3.}; // => 54 x 54 cm2 & 91 x 91 cm2 active area
const Double_t DetectorSizeY[4] = {57., 95., 60.8, 8.16 + 3.}; // quadratic modules
//// default
//const Double_t DetectorSizeX[2] = { 60., 100.}; // => 57 x 57 cm2 & 96 x 96 cm2 active area
//const Double_t DetectorSizeY[2] = { 60., 100.}; // quadratic modules
......
......@@ -309,7 +309,7 @@ CbmTrdModuleSim* CbmTrdDigitizer::AddModule(Int_t detId)
SetUseFASP();
module = fModuleMap[moduleAddress] = new CbmTrdModuleSimT(moduleAddress, lyId, orientation, UseFASP());
Int_t rType(-1);
if ( (rType = geoHandler.GetRadiatorType(path)) >= 0 ) {
if ((rType = geoHandler.GetRadiatorType(path)) >= 0) {
if (!fRadiator2D) { // strong TRD-2D entrance window
// const Char_t *ewin = "Al;C;Air;C;Al";
const Char_t* ewin = "Al;C;HC;C;Al";
......
......@@ -138,7 +138,7 @@ private:
CbmTrdParSetGain* fGainPar; ///< parameter list for keV->ADC gain conversion
CbmTrdParSetGeo* fGeoPar; ///< parameter list for geometry definitions
CbmTrdRadiator* fRadiator; ///< parametrization of radiator TR yield
CbmTrdRadiator* fRadiator2D; ///< parametrization of 2D radiator TR yield
CbmTrdRadiator* fRadiator2D; ///< parametrization of 2D radiator TR yield
CbmTrdRawToDigiR* fConverter;
CbmTrdCheckUtil* fQA;
......
......@@ -43,7 +43,7 @@ using namespace std;
//_________________________________________________________________________________
CbmTrdModuleSimT::CbmTrdModuleSimT(Int_t mod, Int_t ly, Int_t rot, Bool_t FASP)
: CbmTrdModuleSim(mod, ly, rot)
, fConfig( 0 )
, fConfig(0)
, fTriangleBinning(NULL)
, fFASP(NULL)
, fTimeSlice(NULL)
......
......@@ -51,11 +51,12 @@ public:
void SetGamma(Double_t /*gamma*/) { ; }
void SetMessageConverter(CbmTrdRawToDigiR* conv = NULL) { (void) conv; }
void SetQA(CbmTrdCheckUtil* qa = NULL) { (void) qa; }
void SetLabMeasurement(Bool_t set=kTRUE) {
void SetLabMeasurement(Bool_t set = kTRUE)
{
set ? SETBIT(fConfig, kMeasurement) : CLRBIT(fConfig, kMeasurement);
SetFeCalib(set);
}
void SetFeCalib(Bool_t set = kTRUE) { set ? SETBIT(fConfig, kLab) : CLRBIT(fConfig, kLab);}
void SetFeCalib(Bool_t set = kTRUE) { set ? SETBIT(fConfig, kLab) : CLRBIT(fConfig, kLab); }
/**
* \brief Set the FEE type operating on the chamber
......@@ -95,7 +96,7 @@ private:
**/
void DumpBuffer() const;
UChar_t fConfig; ///< bit map for configuration. See class documentation
UChar_t fConfig; ///< bit map for configuration. See class documentation
CbmTrdTrianglePRF* fTriangleBinning; ///< Integration of PRF on triangular pad-plane geometry
CbmTrdFASP* fFASP; ///< FASP simulator
CbmTimeSlice* fTimeSlice; ///< link to CBM time slice
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment