implemented ADDRUN feature which adds runs on the fly. Still very experimental and not thoroughly tested.
This commit is contained in:
@ -186,7 +186,7 @@ typedef struct {
|
||||
double fTemp; ///< temperature during the run
|
||||
double fEnergy; ///< implantation energy of the muon
|
||||
double fTimeResolution; ///< time resolution of the run
|
||||
PDoubleVector fT0s; ///< vector of t0's of a run
|
||||
PIntVector fT0s; ///< vector of t0's of a run
|
||||
vector<PDoubleVector> fDataBin; ///< vector of all histos of a run
|
||||
PNonMusrRawRunData fDataNonMusr; ///< keeps all ascii- or db-file info in case of nonMusr fit
|
||||
} PRawRunData;
|
||||
@ -242,36 +242,36 @@ typedef vector<PMsrParamStructure> PMsrParamList;
|
||||
*
|
||||
*/
|
||||
typedef struct {
|
||||
TString fRunName; ///< name of the run file
|
||||
TString fBeamline; ///< e.g. mue4, mue1, pim3, emu, m15, ... (former: run type)
|
||||
TString fInstitute; ///< e.g. psi, ral, triumf (former: run format)
|
||||
TString fFileFormat; ///< e.g. root, nexus, psi-bin, mud, ascii, db
|
||||
int fFitType; ///< fit type: 0=single histo fit, 2=asymmetry fit, 4=asymmetry in RRF, 8=non muSR
|
||||
int fAlphaParamNo; ///< alpha
|
||||
int fBetaParamNo; ///<
|
||||
int fNormParamNo; ///<
|
||||
int fBkgFitParamNo; ///<
|
||||
int fPhaseParamNo; ///<
|
||||
int fLifetimeParamNo; ///<
|
||||
bool fLifetimeCorrection; ///<
|
||||
PIntVector fMap; ///<
|
||||
int fForwardHistoNo; ///<
|
||||
int fBackwardHistoNo; ///<
|
||||
bool fBkgFixPresent[2]; ///< flag showing if a fixed background is present
|
||||
double fBkgFix[2]; ///<
|
||||
int fBkgRange[4]; ///<
|
||||
int fDataRange[4]; ///<
|
||||
int fT0[2]; ///<
|
||||
double fFitRange[2]; ///<
|
||||
int fPacking; ///<
|
||||
double fRRFFreq; ///< rotating reference frequency
|
||||
int fRRFPacking; ///< rotating reference packing
|
||||
int fAlpha2ParamNo; ///<
|
||||
int fBeta2ParamNo; ///<
|
||||
int fRightHistoNo; ///<
|
||||
int fLeftHistoNo; ///<
|
||||
int fXYDataIndex[2]; ///< used to get the data indices when using db-files
|
||||
TString fXYDataLabel[2]; ///< used to get the indices via labels when using db-files
|
||||
PStringVector fRunName; ///< name of the run file
|
||||
PStringVector fBeamline; ///< e.g. mue4, mue1, pim3, emu, m15, ... (former: run type)
|
||||
PStringVector fInstitute; ///< e.g. psi, ral, triumf (former: run format)
|
||||
PStringVector fFileFormat; ///< e.g. root, nexus, psi-bin, mud, ascii, db
|
||||
int fFitType; ///< fit type: 0=single histo fit, 2=asymmetry fit, 4=asymmetry in RRF, 8=non muSR
|
||||
int fAlphaParamNo; ///< alpha parameter number (fit type 2, 4)
|
||||
int fBetaParamNo; ///< beta parameter number (fit type 2, 4)
|
||||
int fNormParamNo; ///< N0 parameter number (fit type 0)
|
||||
int fBkgFitParamNo; ///< background fit parameter number (fit type 0)
|
||||
int fPhaseParamNo; ///< ??? NEEDED ??? NEEDS TO BE CHECKED !!!
|
||||
int fLifetimeParamNo; ///< muon lifetime parameter number (fit type 0)
|
||||
bool fLifetimeCorrection; ///< lifetime correction flag for viewing (fit type 0)
|
||||
PIntVector fMap; ///< map vector needed to switch parameters for different runs within a single theory
|
||||
int fForwardHistoNo; ///< forward histogram number (fit type 0, 2, 4)
|
||||
int fBackwardHistoNo; ///< backward histogram number (fit type 2, 4)
|
||||
bool fBkgFixPresent[2]; ///< flag showing if a fixed background is present (fit type 0, 2, 4).
|
||||
double fBkgFix[2]; ///< fixed background in (1/ns) (fit type 0, 2, 4)
|
||||
int fBkgRange[4]; ///< background bin range (fit type 0, 2, 4)
|
||||
int fDataRange[4]; ///< data bin range (fit type 0, 2, 4)
|
||||
PIntVector fT0; ///< t0 bins (fit type 0, 2, 4). if fit type 0 -> f0, f1, f2, ...; if fit type 2, 4 -> f0, b0, f1, b1, ...
|
||||
double fFitRange[2]; ///< fit range in (us)
|
||||
int fPacking; ///< packing/rebinning
|
||||
double fRRFFreq; ///< rotating reference frequency (fit type 4)
|
||||
int fRRFPacking; ///< rotating reference packing (fit type 4)
|
||||
int fAlpha2ParamNo; ///< rotating reference alpha2 (fit type 4)
|
||||
int fBeta2ParamNo; ///< rotating reference beta2 (fit type 4)
|
||||
int fRightHistoNo; ///< rotating reference right histogram number (fit type 4)
|
||||
int fLeftHistoNo; ///< rotating reference left histogram number (fit type 4)
|
||||
int fXYDataIndex[2]; ///< used to get the data indices when using db-files (fit type 8)
|
||||
TString fXYDataLabel[2]; ///< used to get the indices via labels when using db-files (fit type 8)
|
||||
} PMsrRunStructure;
|
||||
|
||||
//-------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user