Commit c622f3bc authored by dino's avatar dino
Browse files

A first implementation of charge trapping correction using the new signal...

A first implementation of charge trapping correction using the new signal bases by Bart with the E-field dependent sensitivities.
The production of the n-tuples to check the effect is decided by the keyword WritePSAHits in the PSAFilter.conf.
The correction is applied according to the electron and hole mean free paths specified in PSAFilter.conf by the keywords LambdaE and LambdaH.
Added also more detailed symbols in commonDefs.h (e.g. TF_LOCALSPECTRA or TF_FromGRU_) to control the production of histograms in the individual libraries

git-svn-id: svn://gal-serv.lnl.infn.it/agata/trunk/narval_emulator@905 170316e4-aea8-4b27-aad4-0380ec0519c9
parent a0acd85a
......@@ -103,9 +103,9 @@ EventBuilder::EventBuilder(int nch) :
verbose = false;
bMerger = false;
#ifdef LOCALSPECTRA
#ifdef EEB_LOCALSPECTRA
specTdiff = NULL;
#endif //LOCALSPECTRA
#endif //EEB_LOCALSPECTRA
tstKey1 = tstKey2 = 0;
numKey1 = numKey2 = numBad = badKey = 0;
......@@ -310,12 +310,12 @@ void EventBuilder::process_block( int ichain,
}
else {
// before moving it out, increment the tstamp-diff spectrum
#ifdef LOCALSPECTRA
#ifdef EEB_LOCALSPECTRA
if(nn != minChain) {
int tdiff = int(evq[nn].getTstamp() - minTstamp);
specTdiff->Incr(0, tdiff);
}
#endif //LOCALSPECTRA
#endif //EEB_LOCALSPECTRA
// move it to the output buffer
i4fs = evq[nn].moveOut(obuf+opos);
opos += i4fs;
......@@ -367,9 +367,9 @@ void EventBuilder::process_block( int ichain,
tdiff = 1000 - (int)(tstKey1-tstKey2);
else
tdiff = 1000 + (int)(tstKey2-tstKey1);
#ifdef LOCALSPECTRA
#ifdef EEB_LOCALSPECTRA
specTdiff->Incr(1, tdiff);
#endif //LOCALSPECTRA
#endif //EEB_LOCALSPECTRA
}
}
......@@ -682,18 +682,18 @@ void EventBuilder::process_initialise (UInt_t *error_code)
cout << " ==> Merger to generate event:data starting from mixed event:data:psa" << endl;
}
#ifdef LOCALSPECTRA
#ifdef EEB_LOCALSPECTRA
hGroup.remove();
specTdiff = new nDhist<unsigned int>(2, 2000);
specTdiff->setFileName(fOdirPrefix+"Evb?specTdiff.spec");
specTdiff->setComment("timestamp differences");
hGroup.add(specTdiff);
#endif //LOCALSPECTRA
#endif //EEB_LOCALSPECTRA
cServer.SetCommandFile(fConfPath+gMotherClass+".live");
#ifdef LOCALSPECTRA
#ifdef EEB_LOCALSPECTRA
cServer.SetHistGroup(&hGroup);
#endif //LOCALSPECTRA
#endif //EEB_LOCALSPECTRA
cServer.Start(gMotherClass);
cServer2.Start("EventMerger");
......
......@@ -5,7 +5,7 @@
#include <memory.h>
#include "commonDefs.h"
#ifdef LOCALSPECTRA
#ifdef EEB_LOCALSPECTRA
# include "nDhist.h"
#endif
#include "cycleServer.h"
......@@ -108,15 +108,15 @@ public:
UInt_t noBuild1;
UInt_t noBuild2;
#ifdef LOCALSPECTRA
#ifdef EEB_LOCALSPECTRA
nDhistGroup hGroup; // used to record the pointers of all defined nDhist spectra
#endif //LOCALSPECTRA
#endif //EEB_LOCALSPECTRA
cycleServer cServer; // manager of cyclic operations for event builder
cycleServer cServer2; // manager of cyclic operations for event merger
#ifdef LOCALSPECTRA
#ifdef EEB_LOCALSPECTRA
nDhist<unsigned int> *specTdiff;
#endif //LOCALSPECTRA
#endif //EEB_LOCALSPECTRA
ULong64_t tstKey1, tstKey2;
......
......@@ -77,10 +77,10 @@ const unsigned long long tst1second = 100000000;
const unsigned int defaultCycleEvts = 10000;
const unsigned int defaultCycleTime = 120; //in (timpestamp) seconds
//const double RAD2DEG = 180./acos(-1.);
const double RAD2DEG = 57.29577951308232286464772187173366546630859375;
const double DEG2RAD = 1./RAD2DEG;
//const double DEG2RAD = 0.0174532925199432954743716805978692718781530857086181640625;
//const float RAD2DEG = float( 180./acos(-1.) );
const float RAD2DEG = float(57.29577951308232286464772187173366546630859375);
const float DEG2RAD = 1.f/RAD2DEG;
//const float DEG2RAD = float(0.0174532925199432954743716805978692718781530857086181640625);
// default/maximum length with the present ATCA electronics
const int defTraceLengthRaw = 160;
......@@ -93,26 +93,30 @@ const int defTriggerSample = 10; // 60-10 useful samples passed to the PS
#define dRAND() ( rand()/(RAND_MAX+1.0) )
#define fRAND() ( rand()/(RAND_MAX+1.f) )
////////////////////////////////
//////// Online spectra ////////
////////////////////////////////
//#define _FromGRU_ // All actors that use GRU/ViGRU
#define LOCALSPECTRA // All actors that use spectra from nDhist (now used only in TrackingFilter)
////////////////////////////////////////////////////////////
// Online spectra controlled by the actor-specific macros //
// XX__LOCALSPECTRA and XX_FromGRU_ //
////////////////////////////////////////////////////////////
/////////////////////////////////////
//////// CrystalProducerATCA ////////
/////////////////////////////////////
#define PCI_EXPRESS // reading from the AGATA ATCA carriers via PCI express
#define CP_NO_ADF // CrystalProducerATCA does not use ADF to format the output buffer
/////////////////////////////////
//////// CrystalProducer ////////
/////////////////////////////////
#define PCI_EXPRESS // reading from the AGATA ATCA carriers via PCI express
#define CP_NO_ADF // CrystalProducerATCA does not use ADF to format the output buffer
#define CP_LOCALSPECTRA // enable nDhist spectra
//#define CP_FromGRU_ // enable GRU/ViGRU
/////////////////////////////////////
//////// PreprocessingFilter ////////
/////////////////////////////////////
//#define PP_NO_ADF // PreprocessingFilter does not use ADF to decode/code the IO buffers (still working??)
//#define CHECK_EE_ES // Discard event if CC energy too different from energy derived from trace amplitude
//#define PPF_NO_ADF // PreprocessingFilter does not use ADF to decode/code the IO buffers (still working??)
//#define PPF_CHECK_EE_ES // Discard event if CC energy too different from energy derived from trace amplitude
#define PPF_LOCALSPECTRA // enable nDhist spectra
//#define PPF_FromGRU_ // enable GRU/ViGRU
///////////////////////////
//////// PSAFilter ////////
......@@ -121,16 +125,19 @@ const int defTriggerSample = 10; // 60-10 useful samples passed to the PS
#define TCOUNT 5 // number of threads to use to decompose signals
#define TMODULO 100 // how many events are distributed to each thread
#define USEADAPTIVE // to use the coarse-fine grid searh
#define PSA_LOCALSPECTRA // enable nDhist spectra
//#define PSA_FromGRU_ // enable GRU/ViGRU
/////////////////////////////////
//////// AncillaryFilter ////////
/////////////////////////////////
//#define AF_PRISMA // processing of PRISMA
//#define AF_DANTE // processing of DANTE ==> still to be adjusted
//#define AF_HELENA // processing of the Helena detectors for the neutron test
//#define AF_PRISMA // processing of PRISMA
//#define AF_DANTE // processing of DANTE ==> still to be adjusted
//#define AF_HELENA // processing of the Helena detectors for the neutron test
//#define AF_ROOTTREE
#define AF_LOCALSPECTRA // enable nDhist spectra
//#define AF_FromGRU_ // enable GRU/ViGRU
////////////////////////////
////// TrackingFilter //////
......@@ -140,15 +147,26 @@ const int defTriggerSample = 10; // 60-10 useful samples passed to the PS
#define WRITE_INPUT_HITS // Write input hits into Oft_Hits (AgataMC/mgt ascii file)
//#define EXTENDED_OUTPUT // Oft_Hits contain also timestamp and eventnumber
//#define WRITE_TRACKED // Write the tracked gammas into the Oft_TrackedEnergies ascii file
//#define NTIMING 1 // processing of the Helena detectors for the neutron test
//#define NTIMING 1 // processing of the Helena detectors for the neutron test
//#define TF_ROOTTREE
/////////////////////////////////////////
////// WinCtest and ordered output //////
/////////////////////////////////////////
#define TF_LOCALSPECTRA // enable nDhist spectra
//#define TF_FromGRU_ // enable GRU/ViGRU
///////////////////////////////////
////// The WinCtest Emulator //////
///////////////////////////////////
#define EEB_LOCALSPECTRA // enable nDhist spectra in the emulator event builder
#if defined(CP_LOCALSPECTRA) ||\
defined(PPF_LOCALSPECTRA) ||\
defined(PSA_LOCALSPECTRA) ||\
defined(AF_LOCALSPECTRA) ||\
defined(TF_LOCALSPECTRA) ||\
defined(EEB_LOCALSPECTRA) &&\
!defined(LOCALSPECTRA)
#define LOCALSPECTRA // needed by cycleServer if any individual one is enabled
#endif
//#define COUT_LOCKED // to avoid mixing printouts from parallel threads
......
......@@ -17,7 +17,6 @@ class ratemeter
unsigned int *tCount;
unsigned int mod;
unsigned int pos;
double dmod;
public:
......@@ -46,7 +45,7 @@ public:
time_t tOld = tStart[pos];
unsigned int cOld = tCount[pos];
double sdiff = difftime(tNow, tOld);
if(sdiff < 1) sdiff = 1;
if(sdiff < 1.) sdiff = 1.;
unsigned int srate = (counts>cOld) ? (unsigned int)((counts-cOld)/sdiff) : 0;
// update only if at least mod elapsed seconds since previous update
tOld = tStart[((pos+mod)-1)%mod];
......
......@@ -153,9 +153,9 @@ void AncillaryFilter::process_initialise ( UInt_t *error_code )
*error_code = AlgoSpecificInitialise();
cServer.SetCommandFile(fConfPath+gMotherClass+".live");
#ifdef LOCALSPECTRA
#ifdef AF_LOCALSPECTRA
cServer.SetHistGroup(&hGroup);
#endif //LOCALSPECTRA
#endif //AF_LOCALSPECTRA
cServer.Start(gMotherClass);
......
......@@ -16,7 +16,7 @@
#include "Converter.h"
#include "commonDefs.h"
#ifdef LOCALSPECTRA
#ifdef AF_LOCALSPECTRA
# include "nDhist.h"
#endif
#include "cycleServer.h"
......@@ -61,9 +61,9 @@ protected:
UInt_t outDataLen;
Float_t *outData;
#ifdef LOCALSPECTRA
#ifdef AF_LOCALSPECTRA
nDhistGroup hGroup; // used to record the pointers of all defined nDhist spectra
#endif //LOCALSPECTRA
#endif //AF_LOCALSPECTRA
cycleServer cServer; // manager of cyclic operations
std::string fConfPath;
......
......@@ -29,12 +29,12 @@ fTrigger("data:crystal")
Converter = NULL;
#ifdef LOCALSPECTRA
#ifdef AF_LOCALSPECTRA
AncSpec_All = NULL;
AncMatr_All = NULL;
#endif //LOCALSPECTRA
#endif //AF_LOCALSPECTRA
#ifdef _FromGRU_
#ifdef AF_FromGRU_
Int_t port = 9010;
SpectraDB = new GSpectra();
NetworkRoot = new GNetServerRoot (SpectraDB);
......@@ -45,7 +45,7 @@ fTrigger("data:crystal")
NetworkRoot->StartGNetServer(false);
cout << "GRU port opened " << port << endl;
#endif // _FromGRU_
#endif // AF_FromGRU_
// for the analysis of Dante week27
mwd = new MWD(nNsamp);
......@@ -63,7 +63,7 @@ fTrigger("data:crystal")
AncillaryFilterATCA::~AncillaryFilterATCA()
{
#ifdef _FromGRU_
#ifdef AF_FromGRU_
delete TxTy_Dante;
delete AllChan;
#endif
......@@ -129,9 +129,9 @@ void AncillaryFilterATCA::process_initialise ( UInt_t *error_code )
*error_code = AlgoSpecificInitialise();
cServer.SetCommandFile(fConfPath+gMotherClass+".live");
#ifdef LOCALSPECTRA
#ifdef AF_LOCALSPECTRA
cServer.SetHistGroup(&hGroup);
#endif //LOCALSPECTRA
#endif //AF_LOCALSPECTRA
cServer.Start(gMotherClass);
}
......@@ -265,21 +265,21 @@ void AncillaryFilterATCA::MakeSpectra()
for(UInt_t indChan = 0; indChan < outDataLen; indChan++) {
int value = (int)outData[indChan];
if(value) {
#ifdef LOCALSPECTRA
#ifdef AF_LOCALSPECTRA
if(AncSpec_All)
AncSpec_All->Incr(indChan, value);
#endif //LOCALSPECTRA
#ifdef _FromGRU_
#endif //AF_LOCALSPECTRA
#ifdef AF_FromGRU_
AllChan->Fill(value+4096*indChan);
#endif
}
}
#ifdef _FromGRU_
#ifdef AF_FromGRU_
TxTy_Dante->Fill(DantePos[0], DantePos[1]);
#endif
#ifdef LOCALSPECTRA
#ifdef AF_LOCALSPECTRA
if(AncMatr_All) {
float splen = (float)AncMatr_All->getLenSpec();
float scale = 1.f; // adjust manually as needed
......@@ -294,13 +294,13 @@ void AncillaryFilterATCA::MakeSpectra()
}
}
}
#endif //LOCALSPECTRA
#endif //AF_LOCALSPECTRA
}
bool AncillaryFilterATCA::initPresort()
{
#ifdef LOCALSPECTRA
#ifdef AF_LOCALSPECTRA
if(AncSpec_All) delete AncSpec_All;
AncSpec_All = new nDhist<unsigned int>(outDataLen, 4096);
AncSpec_All->setFileName(fOdirPrefix+"Anc?All.spec");
......@@ -312,9 +312,9 @@ bool AncillaryFilterATCA::initPresort()
//AncMatr_All->setFileName(fOdirPrefix+"Anc?All.matr");
//AncMatr_All->setComment("Matrix of all pairs");
//hGroup.add(AncMatr_All);
#endif //LOCALSPECTRA
#endif //AF_LOCALSPECTRA
#ifdef _FromGRU_
#ifdef AF_FromGRU_
TxTy_Dante = new TH2F("RawTimeX-RawTimeY_Dante", "RawTimeX-RawTimeY_Dante", 256,0,4096,256,0,4096);
AllChan = new TH1I("AllTheChannels","AllTheChannels",4096*outDataLen,0,4096*outDataLen-1);
SpectraDB->AddSpectrum ( TxTy_Dante);
......
......@@ -10,7 +10,7 @@
#include "mwdlib.h"
#include "Dante.h"
#ifdef _FromGRU_
#ifdef AF_FromGRU_
#include <iostream>
#include <TSystem.h>
#include <GAcq.h>
......@@ -21,7 +21,7 @@
#include <TH1.h>
#include <TH2.h>
#include <TH3.h>
#endif // _FromGRU_
#endif // AF_FromGRU_
class AncillaryFilterATCA : public AncillaryFilter
{
......@@ -52,7 +52,7 @@ private:
bool initPresort();
bool analyseDante(Float_t posx, Float_t posy);
#ifdef _FromGRU_
#ifdef AF_FromGRU_
GNetServerRoot *NetworkRoot;
GSpectra *SpectraDB;
TH2F *TxTy_Dante;
......@@ -73,10 +73,10 @@ protected:
public:
#ifdef LOCALSPECTRA
#ifdef AF_LOCALSPECTRA
nDhist<unsigned int >*AncSpec_All;
nDhist<unsigned short>*AncMatr_All;
#endif //LOCALSPECTRA
#endif //AF_LOCALSPECTRA
Dante RotDante;
float DantePos[3]; // position in its frame
......
......@@ -28,13 +28,13 @@ const int pS = 4; //4 Side sections:A,B,C,D
AncillaryFilterVME::AncillaryFilterVME()
{
#ifdef LOCALSPECTRA
#ifdef AF_LOCALSPECTRA
AncSpec_All = NULL;
AncSpec_Cal = NULL;
MatrAll_PRISMA = NULL;
MatrAll_DANTE = NULL;
MatrAll_HELENA = NULL;
#endif //LOCALSPECTRA
#endif //AF_LOCALSPECTRA
fAllPairsMat = true;
#ifdef AF_PRISMA
......@@ -43,7 +43,7 @@ AncillaryFilterVME::AncillaryFilterVME()
memset(Counter, 0, sizeof(Counter));
#endif // AF_PRISMA
#ifdef _FromGRU_
#ifdef AF_FromGRU_
Int_t port = 9010;
SpectraDB = new GSpectra();
NetworkRoot = new GNetServerRoot (SpectraDB);
......@@ -56,7 +56,7 @@ AncillaryFilterVME::AncillaryFilterVME()
cout << "GRU port opened " << port << endl;
memset(XFP, 0, sizeof(XFP));
#endif // _FromGRU_
#endif // AF_FromGRU_
#ifdef AF_DANTE
cout << "**************************************************" << endl;
......@@ -82,7 +82,7 @@ AncillaryFilterVME::~AncillaryFilterVME()
delete theManager;
#endif
#ifdef _FromGRU_
#ifdef AF_FromGRU_
delete TxTy_Dante0;
delete TxTy_Dante1;
delete TimingLaBrLaBr; delete TimingLaBrGe; delete TimingLaBrGe1;
......@@ -94,7 +94,7 @@ AncillaryFilterVME::~AncillaryFilterVME()
delete [] LR_Cath[nn];
delete [] TOF[nn];
};
#endif // _FromGRU_
#endif // AF_FromGRU_
}
Int_t AncillaryFilterVME::AlgoSpecificInitialise()
......@@ -237,22 +237,22 @@ void AncillaryFilterVME::Projections()
for(UInt_t indChan = 0; indChan < numChan; indChan++) {
int value = (Int_t)cv->Value[indChan]; // should check what to do for scalers
if(value) {
#ifdef LOCALSPECTRA
#ifdef AF_LOCALSPECTRA
if(AncSpec_All)
AncSpec_All->Incr(indMod, indChan, value);
if(AncSpec_Cal) {
int cvalue = Int_t(cv->GetCalibratedValue(indChan)*xScale);
AncSpec_Cal->Incr(indMod, indChan, cvalue);
}
#endif //LOCALSPECTRA
#ifdef _FromGRU_
#endif //AF_LOCALSPECTRA
#ifdef AF_FromGRU_
AllChan->Fill(value+indMod*4096*32+4096*indChan);
#endif
}
}
}
#ifdef LOCALSPECTRA
#ifdef AF_LOCALSPECTRA
if(MatrAll_PRISMA) {
for(unsigned int n1 = 0; n1 < 3*32; n1++) {
float val1 = outData[n1]*mtAllScale;
......@@ -297,14 +297,14 @@ void AncillaryFilterVME::Projections()
}
}
}
#endif //LOCALSPECTRA
#endif //AF_LOCALSPECTRA
}
// should check consistency of what is done here
void AncillaryFilterVME::Analysis()
{
#if defined(_FromGRU_) && defined(AF_PRISMA) // ??
#if defined(AF_FromGRU_) && defined(AF_PRISMA) // ??
// if ( (Converter[3].GetValue(0)!=0 && Converter[3].GetValue(0)>200.f) &&
// (Converter[3].GetValue(1)!=0 && Converter[3].GetValue(1)>200.f) &&
// (Converter[3].GetValue(2)!=0 && Converter[3].GetValue(2)>200.f) &&
......@@ -334,9 +334,9 @@ void AncillaryFilterVME::Analysis()
// TimingLaBrGe ->Fill( Converter[1].GetValue(13), Converter[1].GetValue(6));
// TimingLaBrGe1 ->Fill( Converter[1].GetValue(13), Converter[1].GetValue(4));
#endif // _FromGRU_ && AF_PRISMA
#endif // AF_FromGRU_ && AF_PRISMA
#if defined(_FromGRU_) && defined(AF_DANTE)
#if defined(AF_FromGRU_) && defined(AF_DANTE)
if ( (Converter[0].GetValue(0)!=0 && Converter[0].GetValue(0)>800.f) &&
(Converter[0].GetValue(1)!=0 && Converter[0].GetValue(1)>800.f) &&
(Converter[0].GetValue(2)!=0 && Converter[0].GetValue(2)>800.f) &&
......@@ -353,12 +353,12 @@ void AncillaryFilterVME::Analysis()
// TimingLaBrLaBr->Fill( Converter[1].GetValue(13),Converter[1].GetValue(14));
// TimingLaBrGe ->Fill( Converter[1].GetValue(13),Converter[1].GetValue(6));
// TimingLaBrGe1 ->Fill( Converter[1].GetValue(13),Converter[1].GetValue(4));
#endif // _FromGRU_ && AF_DANTE
#endif // AF_FromGRU_ && AF_DANTE
}
bool AncillaryFilterVME::initPresort()
{
#ifdef LOCALSPECTRA
#ifdef AF_LOCALSPECTRA
if(AncSpec_All) delete AncSpec_All;
AncSpec_All = new nDhist<unsigned int>(TotNumMod, 32, 4096);
AncSpec_All->setFileName(fOdirPrefix+"Spec?All.spec");
......@@ -401,9 +401,9 @@ bool AncillaryFilterVME::initPresort()
//}
# endif // AF_HELENA
#endif //LOCALSPECTRA
#endif //AF_LOCALSPECTRA
#ifdef _FromGRU_
#ifdef AF_FromGRU_
TxTy_Dante0 = new TH2F("RawTimeX-RawTimeY_Dante0", "RawTimeX-RawTimeY_Dante0", 256,0,4096,256,0,4096);
TxTy_Dante1 = new TH2F("RawTimeX-RawTimeY_Dante1", "RawTimeX-RawTimeY_Dante1", 256,0,4096,256,0,4096);
TimingLaBrLaBr = new TH2F("TimingLaBrLaBr", "Timing_0", 200,0,1999,200,0,1999);
......@@ -453,7 +453,7 @@ bool AncillaryFilterVME::initPresort()
SpectraDB->AddSpectrum( TOF[i],"TOF");
}
#endif // _FromGRU_
#endif // AF_FromGRU_
return true;
}
......@@ -649,7 +649,7 @@ bool AncillaryFilterVME::processEventPRISMA()
" , " << theManager->velocity().Y()<<
" , " << theManager->velocity().Z()<< endl;
#ifdef _FromGRU_
#ifdef AF_FromGRU_
Ic_Range -> Fill(theManager->range()/mm,theManager->ic_energy());
TOF_D -> Fill(theManager->length()/mm/2, 10*theManager->tof()/ns);
PRISMA_MCPcal -> Fill(theManager->mcp_x()/mm , theManager->mcp_y()/mm) ;
......@@ -661,7 +661,7 @@ bool AncillaryFilterVME::processEventPRISMA()
Vel = Vector3D(0,0,0);
}
#ifdef _FromGRU_
#ifdef AF_FromGRU_
if( ( theManager->mcp_x() > -1000.*mm ) && ( theManager->mcp_y() > -1000.*mm ) ) {
int error_code = theManager->ppac_err_code();
tmp_ERR->Fill(error_code);
......@@ -670,13 +670,13 @@ bool AncillaryFilterVME::processEventPRISMA()
// cout <<"error code 20 --> Tof[" << ii << "] = " << Converter[0].GetValue(22+ii) << endl;
//}
}
#endif // _FromGRU_
#endif // AF_FromGRU_
// PRISMA_MCPcal ->Fill(theManager->mcp_x()/mm , theManager->mcp_y()/mm) ;
// PRISMA_X_FP ->Fill( theManager->x_fp() /mm) ;
// PRISMA_Vel ->Fill( Vel.rho()) ;
#ifdef _FromGRU_
#ifdef AF_FromGRU_
LR_Cath[0] ->Fill( Converter[2].GetValue( 3), Converter[2].GetValue( 0) + Converter[2].GetValue( 1));
LR_Cath[1] ->Fill( Converter[2].GetValue(23), Converter[2].GetValue( 2) + Converter[2].GetValue(22));
LR_Cath[2] ->Fill( Converter[2].GetValue(24), Converter[2].GetValue( 4) + Converter[2].GetValue( 5));
......
......@@ -14,7 +14,7 @@
//#error AncillaryFilterVME not (yet) possible to define both AF_PRISMA and AF_DANTE
//#endif
#ifdef _FromGRU_
#ifdef AF_FromGRU_
#include <iostream>
#include <TSystem.h>
#include <GAcq.h>
......@@ -25,7 +25,7 @@
#include <TH1.h>
#include <TH2.h>
#include <TH3.h>
#endif // _FromGRU_
#endif // AF_FromGRU_
#ifdef AF_PRISMA
#include "SystemsOfUnits.hh"
......@@ -43,7 +43,7 @@ class AncillaryFilterVME : public AncillaryFilter
private:
bool initPresort();
#ifdef _FromGRU_
#ifdef AF_FromGRU_
GNetServerRoot *NetworkRoot;
GSpectra *SpectraDB;
TH2F *TxTy_Dante0, *TxTy_Dante1, *TimingLaBrLaBr, *TimingLaBrGe, *TimingLaBrGe1;
......@@ -64,13 +64,13 @@ protected:
void Analysis();
public:
#ifdef LOCALSPECTRA
#ifdef AF_LOCALSPECTRA
nDhist<unsigned int >*AncSpec_All;
nDhist<unsigned int >*AncSpec_Cal;
nDhist<unsigned short>*MatrAll_PRISMA;
nDhist<unsigned short>*MatrAll_DANTE;
nDhist<unsigned short>*MatrAll_HELENA;
#endif //LOCALSPECTRA
#endif //AF_LOCALSPECTRA
#ifdef AF_PRISMA
bool processEventPRISMA();
......
......@@ -58,8 +58,8 @@ public:
rotMat[0][0] = rotMat[1][1] = rotMat[2][2] = 1.f;
}
void RotX(float adeg) {
double xcos = cos(adeg*DEG2RAD);
double xsin = sin(adeg*DEG2RAD);
float xcos = cos(adeg*DEG2RAD);
float xsin = sin(adeg*DEG2RAD);
memset(rotTmp, 0, sizeof(rotTmp));
rotTmp[0][0] = 1.f;
rotTmp[1][1] = rotTmp[2][2] = float(xcos);
......@@ -68,8 +68,8 @@ public:
matMult3D((float *)rotTmp, (float *)rotMat, (float *)rotMat);
}
void RotY(float adeg) {