From ba999b0a4b1cbf7a1b635d79bf7751021c9e624e Mon Sep 17 00:00:00 2001 From: hristov Date: Mon, 14 Apr 2008 05:51:08 +0000 Subject: [PATCH] Compilation on Windows/Cygwin --- PHOS/AliPHOSLoader.cxx | 20 ++++++++--------- PHOS/AliPHOSLoader.h | 2 +- PHOS/AliPHOSv1.h | 2 +- PHOS/PHOSbaseLinkDef.h | 11 ++++++++-- PHOS/PHOSrecLinkDef.h | 4 +--- PHOS/PHOSsimLinkDef.h | 6 +----- PHOS/libPHOSbase.pkg | 48 +++++++++++++++++++++++++++-------------- PHOS/libPHOSrec.pkg | 14 ++++++++---- PHOS/libPHOSshuttle.pkg | 7 ++++++ PHOS/libPHOSsim.pkg | 18 ++++++++++------ build/module.dep | 3 ++- 11 files changed, 85 insertions(+), 50 deletions(-) diff --git a/PHOS/AliPHOSLoader.cxx b/PHOS/AliPHOSLoader.cxx index 4d7fd1fd4fb..5c0502a324e 100644 --- a/PHOS/AliPHOSLoader.cxx +++ b/PHOS/AliPHOSLoader.cxx @@ -192,16 +192,16 @@ Int_t AliPHOSLoader::GetEvent() return 0; } -//____________________________________________________________________________ -const AliPHOS * AliPHOSLoader::PHOS() -{ - // returns the PHOS object - AliPHOS * phos = dynamic_cast(GetModulesFolder()->FindObject(fDetectorName)); - if ( phos == 0x0) - if (fDebug) - cout << "WARNING: AliPHOSLoader::PHOS -> PHOS module not found in Folders" << endl ; - return phos ; -} +// //____________________________________________________________________________ +// const AliPHOS * AliPHOSLoader::PHOS() +// { +// // returns the PHOS object +// AliPHOS * phos = dynamic_cast(GetModulesFolder()->FindObject(fDetectorName)); +// if ( phos == 0x0) +// if (fDebug) +// cout << "WARNING: AliPHOSLoader::PHOS -> PHOS module not found in Folders" << endl ; +// return phos ; +// } //____________________________________________________________________________ Int_t AliPHOSLoader::LoadHits(Option_t* opt) diff --git a/PHOS/AliPHOSLoader.h b/PHOS/AliPHOSLoader.h index b834709e921..d086278768c 100644 --- a/PHOS/AliPHOSLoader.h +++ b/PHOS/AliPHOSLoader.h @@ -128,7 +128,7 @@ public: Int_t EventNumber() { return (Int_t) GetRunLoader()->GetEventNumber();} Int_t MaxEvent() { return (Int_t) GetRunLoader()->TreeE()->GetEntries();} - const AliPHOS * PHOS(); +/* const AliPHOS * PHOS(); */ // Alarms // TFolder * Alarms() const { return (TFolder*)(ReturnO("Alarms", 0)); } TObjArray * Alarms() {return 0x0;} diff --git a/PHOS/AliPHOSv1.h b/PHOS/AliPHOSv1.h index 20d2c109667..1e7d66373c4 100644 --- a/PHOS/AliPHOSv1.h +++ b/PHOS/AliPHOSv1.h @@ -24,8 +24,8 @@ // --- ROOT system --- class TClonesArray ; -class TLorentzVector ; class TFile; +#include // --- AliRoot header files --- #include "AliPHOSv0.h" diff --git a/PHOS/PHOSbaseLinkDef.h b/PHOS/PHOSbaseLinkDef.h index 3be4d49efd4..8abf98b5c2f 100644 --- a/PHOS/PHOSbaseLinkDef.h +++ b/PHOS/PHOSbaseLinkDef.h @@ -9,13 +9,14 @@ #pragma link C++ class AliPHOSCPVGeometry+; #pragma link C++ class AliPHOSSupportGeometry+; #pragma link C++ class AliPHOSGeometry+; -#pragma link C++ class AliPHOS+; #pragma link C++ class AliPHOSLoader+; #pragma link C++ class AliPHOSHit+; #pragma link C++ class AliPHOSTrackSegmentMaker+; #pragma link C++ class AliPHOSPID+; #pragma link C++ class AliPHOSClusterizer+; #pragma link C++ class AliPHOSCalibrationDB+; +#pragma link C++ class AliPHOSCalibrationData+; +#pragma link C++ class AliPHOSCalibrManager+; #pragma link C++ class AliPHOSDigitizer+; #pragma link C++ class AliPHOSSDigitizer+; #pragma link C++ class AliPHOSDigit+; @@ -40,7 +41,13 @@ #pragma link C++ class AliPHOSEmcRecPoint+; #pragma link C++ class AliPHOSTrackSegment+; -#pragma link C++ class AliPHOSReconstructor+; +#pragma link C++ class AliPHOSRecoParam+; +#pragma link C++ class AliPHOSRecoParamEmc+; +#pragma link C++ class AliPHOSRecoParamCpv+; #pragma link C++ class AliPHOSSimParam+; +#pragma link C++ class AliPHOSConTableDB+; + +#pragma link C++ class AliPHOSImpact+; +#pragma link C++ class AliPHOSTrigger+; #endif diff --git a/PHOS/PHOSrecLinkDef.h b/PHOS/PHOSrecLinkDef.h index 71b527b8e9a..616168edf77 100644 --- a/PHOS/PHOSrecLinkDef.h +++ b/PHOS/PHOSrecLinkDef.h @@ -21,10 +21,8 @@ #pragma link C++ class AliPHOSJetFinder+; #pragma link C++ class AliPHOSGridFile+; #pragma link C++ class AliPHOSTracker+; -#pragma link C++ class AliPHOSRecoParam+; -#pragma link C++ class AliPHOSRecoParamEmc+; -#pragma link C++ class AliPHOSRecoParamCpv+; #pragma link C++ class AliPHOSEsdCluster+; #pragma link C++ class AliPHOSQADataMakerRec+; +#pragma link C++ class AliPHOSReconstructor+; #endif diff --git a/PHOS/PHOSsimLinkDef.h b/PHOS/PHOSsimLinkDef.h index d1b785add87..17cf7e0644c 100644 --- a/PHOS/PHOSsimLinkDef.h +++ b/PHOS/PHOSsimLinkDef.h @@ -4,22 +4,18 @@ #pragma link off all classes; #pragma link off all functions; +#pragma link C++ class AliPHOS+; #pragma link C++ class AliPHOSv0+; #pragma link C++ class AliPHOSv1+; #pragma link C++ class AliPHOSv2+; #pragma link C++ class AliPHOSvFast+; #pragma link C++ class AliPHOSvImpacts+; -#pragma link C++ class AliPHOSImpact+; #pragma link C++ class AliPHOSCPVDigit+; #pragma link C++ class AliPHOSTick+; #pragma link C++ class AliPHOSRaw2Digits+; #pragma link C++ class AliPHOSBeamTestEvent+; -#pragma link C++ class AliPHOSCalibrationData+; -#pragma link C++ class AliPHOSCalibrManager+; #pragma link C++ class AliPHOSCalibrator+; -#pragma link C++ class AliPHOSConTableDB+; #pragma link C++ class AliPHOSOnlineMonitor+; -#pragma link C++ class AliPHOSTrigger+; #pragma link C++ class AliPHOSQADataMakerSim+; #endif diff --git a/PHOS/libPHOSbase.pkg b/PHOS/libPHOSbase.pkg index 67d6b4d06db..b64ef3fde4a 100644 --- a/PHOS/libPHOSbase.pkg +++ b/PHOS/libPHOSbase.pkg @@ -1,30 +1,39 @@ -SRCS = AliPHOS.cxx \ +#-*- Mode: Makefile -*- + +SRCS = \ AliPHOSGeometry.cxx \ AliPHOSEMCAGeometry.cxx \ AliPHOSCPVGeometry.cxx AliPHOSCPVBaseGeometry.cxx \ AliPHOSSupportGeometry.cxx \ AliPHOSLoader.cxx \ AliPHOSHit.cxx AliPHOSTrackSegmentMaker.cxx AliPHOSPID.cxx \ - AliPHOSClusterizer.cxx \ - AliPHOSCalibrationDB.cxx AliPHOSDigitizer.cxx \ - AliPHOSSDigitizer.cxx AliPHOSDigit.cxx \ - AliPHOSFastRecParticle.cxx AliPHOSRawStream2004.cxx \ - AliPHOSCalibData.cxx \ + AliPHOSClusterizer.cxx \ + AliPHOSCalibrationDB.cxx AliPHOSDigitizer.cxx \ + AliPHOSSDigitizer.cxx AliPHOSDigit.cxx \ + AliPHOSFastRecParticle.cxx AliPHOSRawStream2004.cxx \ + AliPHOSCalibData.cxx \ + AliPHOSCalibrationData.cxx \ AliPHOSCpvCalibData.cxx \ - AliPHOSEmcCalibData.cxx \ - AliPHOSPulseGenerator.cxx \ - AliPHOSRawDecoder.cxx \ - AliPHOSRawDecoderv1.cxx \ - AliPHOSRawDecoderv2.cxx \ - AliPHOSRawDigiProducer.cxx \ - AliPHOSEmcBadChannelsMap.cxx \ - AliPHOSSurvey.cxx \ - AliPHOSSurvey1.cxx \ + AliPHOSEmcCalibData.cxx AliPHOSCalibrManager.cxx \ + AliPHOSConTableDB.cxx \ + AliPHOSPulseGenerator.cxx \ + AliPHOSRawDecoder.cxx \ + AliPHOSRawDecoderv1.cxx \ + AliPHOSRawDecoderv2.cxx \ + AliPHOSRawDigiProducer.cxx \ + AliPHOSEmcBadChannelsMap.cxx \ + AliPHOSSurvey.cxx \ + AliPHOSSurvey1.cxx \ AliPHOSQAChecker.cxx \ AliPHOSRecParticle.cxx AliPHOSRecPoint.cxx \ AliPHOSEmcRecPoint.cxx \ AliPHOSCpvRecPoint.cxx AliPHOSTrackSegment.cxx \ - AliPHOSReconstructor.cxx AliPHOSSimParam.cxx + AliPHOSRecoParam.cxx \ + AliPHOSRecoParamEmc.cxx \ + AliPHOSRecoParamCpv.cxx \ + AliPHOSImpact.cxx \ + AliPHOSTrigger.cxx \ + AliPHOSSimParam.cxx HDRS:= $(SRCS:.cxx=.h) @@ -32,5 +41,12 @@ DHDR= PHOSbaseLinkDef.h EINCLUDE:=RAW +ifeq (win32gcc,$(ALICE_TARGET)) +PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \ + -lSTEER -lCDB -lESD -lSTEERBase \ + -lRAWDatasim -lRAWDatarec -lRAWDatabase \ + -L$(shell root-config --libdir) -lVMC -lEG -lGeom -lMinuit +endif + diff --git a/PHOS/libPHOSrec.pkg b/PHOS/libPHOSrec.pkg index c986379afff..2a12fe1d1b3 100644 --- a/PHOS/libPHOSrec.pkg +++ b/PHOS/libPHOSrec.pkg @@ -1,3 +1,5 @@ +#-*- Mode: Makefile -*- + SRCS = \ AliPHOSClusterizerv1.cxx \ AliPHOSLink.cxx \ @@ -12,11 +14,8 @@ SRCS = \ AliPHOSJet.cxx AliPHOSJetFinder.cxx\ AliPHOSGridFile.cxx \ AliPHOSTracker.cxx \ - AliPHOSRecoParam.cxx \ - AliPHOSRecoParamEmc.cxx \ - AliPHOSRecoParamCpv.cxx \ AliPHOSEsdCluster.cxx \ - AliPHOSQADataMakerRec.cxx + AliPHOSQADataMakerRec.cxx AliPHOSReconstructor.cxx HDRS:= $(SRCS:.cxx=.h) @@ -26,4 +25,11 @@ DHDR= PHOSrecLinkDef.h EINCLUDE:=RAW +ifeq (win32gcc,$(ALICE_TARGET)) +PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \ + -lPHOSbase -lSTEER -lCDB -lESD -lSTEERBase \ + -lRAWDatarec \ + -L$(shell root-config --libdir) -lMinuit -lVMC -lEG -lGeom +endif + diff --git a/PHOS/libPHOSshuttle.pkg b/PHOS/libPHOSshuttle.pkg index fdac7f34063..b339e010bf0 100644 --- a/PHOS/libPHOSshuttle.pkg +++ b/PHOS/libPHOSshuttle.pkg @@ -1,3 +1,5 @@ +#-*- Mode: Makefile -*- + SRCS = AliPHOSCalibHistoProducer.cxx \ AliPHOSPreprocessor.cxx \ AliPHOSDA1.cxx \ @@ -10,3 +12,8 @@ HDRS:= $(SRCS:.cxx=.h) DHDR= PHOSshuttleLinkDef.h EINCLUDE:=RAW + +ifeq (win32gcc,$(ALICE_TARGET)) +PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \ + -lPHOSbase -lSTEER -lCDB -lSTEERBase +endif diff --git a/PHOS/libPHOSsim.pkg b/PHOS/libPHOSsim.pkg index 37208f93b49..650f0dffa81 100644 --- a/PHOS/libPHOSsim.pkg +++ b/PHOS/libPHOSsim.pkg @@ -1,15 +1,13 @@ -SRCS = AliPHOSv0.cxx AliPHOSv1.cxx AliPHOSv2.cxx \ +#-*- Mode: Makefile -*- + +SRCS = AliPHOS.cxx AliPHOSv0.cxx AliPHOSv1.cxx AliPHOSv2.cxx \ AliPHOSvFast.cxx AliPHOSvImpacts.cxx \ - AliPHOSImpact.cxx \ AliPHOSCPVDigit.cxx \ AliPHOSTick.cxx \ AliPHOSRaw2Digits.cxx AliPHOSBeamTestEvent.cxx \ - AliPHOSCalibrationData.cxx\ - AliPHOSCalibrator.cxx AliPHOSCalibrManager.cxx \ - AliPHOSConTableDB.cxx \ + AliPHOSCalibrator.cxx \ AliPHOSOnlineMonitor.cxx \ - AliPHOSTrigger.cxx \ - AliPHOSQADataMakerSim.cxx + AliPHOSQADataMakerSim.cxx HDRS:= $(SRCS:.cxx=.h) @@ -19,3 +17,9 @@ EINCLUDE:=RAW +ifeq (win32gcc,$(ALICE_TARGET)) +PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \ + -lPHOSbase -lSTEER -lSTEERBase \ + -lRAWDatarec -lRAWDatasim -lRAWDatabase\ + -L$(shell root-config --libdir) -lVMC -lEG -lGeom -lPhysics +endif diff --git a/build/module.dep b/build/module.dep index 161367ea0af..98bcd1d1942 100644 --- a/build/module.dep +++ b/build/module.dep @@ -122,7 +122,7 @@ $(LIBPATH)/libT0rec.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libCDB $(LIBPATH)/libT0shuttle.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libCDB.$(SOEXT) $(LIBPATH)/libT0base.$(SOEXT) $(LIBPATH)/libPHOSbase.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libCDB.$(SOEXT) $(LIBPATH)/libESD.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libRAWDatarec.$(SOEXT) $(LIBPATH)/libRAWDatasim.$(SOEXT) $(LIBPATH)/libRAWDatabase.$(SOEXT) $(LIBPATH)/libPHOSrec.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libCDB.$(SOEXT) $(LIBPATH)/libESD.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libRAWDatarec.$(SOEXT) $(LIBPATH)/libPHOSbase.$(SOEXT) -$(LIBPATH)/libPHOSsim.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libRAWDatarec.$(SOEXT) $(LIBPATH)/libPHOSbase.$(SOEXT) $(LIBPATH)/libPHOSrec.$(SOEXT) +$(LIBPATH)/libPHOSsim.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libRAWDatarec.$(SOEXT) $(LIBPATH)/libRAWDatasim.$(SOEXT) $(LIBPATH)/libRAWDatabase.$(SOEXT) $(LIBPATH)/libPHOSbase.$(SOEXT) $(LIBPATH)/libPHOSshuttle.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libCDB.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libPHOSbase.$(SOEXT) $(LIBPATH)/libFMDbase.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libCDB.$(SOEXT) $(LIBPATH)/libESD.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libRAWDatabase.$(SOEXT) $(LIBPATH)/libFMDsim.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libCDB.$(SOEXT) $(LIBPATH)/libESD.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libRAWDatarec.$(SOEXT) $(LIBPATH)/libRAWDatasim.$(SOEXT) $(LIBPATH)/libRAWDatabase.$(SOEXT) $(LIBPATH)/libFMDbase.$(SOEXT) @@ -144,4 +144,5 @@ $(LIBPATH)/libAliengui.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/lib $(LIBPATH)/libCORRFW.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libESD.$(SOEXT) $(LIBPATH)/libANALYSIS.$(SOEXT) $(LIBPATH)/libTDPMjet.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libEVGEN.$(SOEXT) $(LIBPATH)/libdpmjet.$(SOEXT) $(LIBPATH)/libSTAT.$(SOEXT): $(LIBPATH)/libCDB.$(SOEXT) +$(LIBPATH)/libMONITOR.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libESD.$(SOEXT) $(LIBPATH)/libTPCbase.$(SOEXT) $(LIBPATH)/libTPCrec.$(SOEXT) $(LIBPATH)/libTPCsim.$(SOEXT) $(LIBPATH)/libITSbase.$(SOEXT) $(LIBPATH)/libITSrec.$(SOEXT) $(LIBPATH)/libRAWDatarec.$(SOEXT) endif -- 2.43.0