Migration of PWG2/FEMTOSCOPY to PWGCF/FEMTOSCOPY
authorakisiel <akisiel@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 30 Jan 2012 16:34:40 +0000 (16:34 +0000)
committerakisiel <akisiel@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 30 Jan 2012 16:34:40 +0000 (16:34 +0000)
280 files changed:
PWG2/CMakelibPWG2AOD.pkg [deleted file]
PWG2/CMakelibPWG2femtoscopy.pkg [deleted file]
PWG2/CMakelibPWG2femtoscopyUser.pkg [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliAnalysisTaskFemto.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliAnalysisTaskFemto.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoAODTrackCut.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoAODTrackCut.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoAnalysis.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoAnalysisAzimuthal.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoAnalysisAzimuthal.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoAnalysisCollection.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoAnalysisReactionPlane.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoAnalysisReactionPlane.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoBPLCMS3DCorrFctn.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoBPLCMS3DCorrFctn.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoBasicEventCut.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoBasicEventCut.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoBasicTrackCut.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoBasicTrackCut.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoCorrFctn.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoCorrFctn.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoCorrFctn3DLCMSSym.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoCorrFctn3DLCMSSym.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoCorrFctn3DSpherical.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoCorrFctn3DSpherical.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoCorrFctnCollection.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoCorrFctnNonIdDR.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoCorrFctnNonIdDR.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoCoulomb.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoCoulomb.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitor.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitor.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorCollection.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorEventMult.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorEventMult.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorEventVertex.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorEventVertex.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorHandler.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorHandler.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticlePID.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticlePID.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticleVertPos.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticleVertPos.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticleYPt.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticleYPt.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoDummyPairCut.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoDummyPairCut.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoEnumeration.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoEvent.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoEvent.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventCut.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventCutEstimators.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventCutEstimators.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReader.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReader.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderAOD.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderAOD.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderAODChain.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderAODChain.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderESD.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderESD.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderESDChain.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderESDChain.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderESDChainKine.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderESDChainKine.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderKinematicsChain.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderKinematicsChain.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderStandard.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventReaderStandard.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventWriter.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoEventWriterCollection.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoFsiTools.F [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoFsiWeightLednicky.F [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoHelix.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoHiddenInfo.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoKTPairCut.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoKTPairCut.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoKink.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoKink.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoKinkCollection.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoKinkCut.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoLikeSignAnalysis.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoLikeSignAnalysis.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoLikeSignCorrFctn.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoLorentzVector.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoLorentzVectorD.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoMCTrackCut.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoMCTrackCut.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoManager.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoManager.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelCorrFctn.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelCorrFctn.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelFreezeOutGenerator.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelFreezeOutGenerator.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelGausLCMSFreezeOutGenerator.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelGausLCMSFreezeOutGenerator.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelGlobalHiddenInfo.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelGlobalHiddenInfo.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelHiddenInfo.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelHiddenInfo.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelManager.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelManager.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelWeightGenerator.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelWeightGenerator.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelWeightGeneratorBasic.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelWeightGeneratorBasic.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelWeightGeneratorLednicky.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoModelWeightGeneratorLednicky.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoPair.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoPair.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoPairCut.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoParticle.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoParticle.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoParticleCollection.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoParticleCut.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoPicoEvent.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoPicoEvent.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoPicoEventCollection.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoPicoEventCollectionVector.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoPicoEventCollectionVectorHideAway.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoPicoEventCollectionVectorHideAway.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoQinvCorrFctn.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoQinvCorrFctn.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoSimpleAnalysis.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoSimpleAnalysis.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoString.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoThreeVector.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoThreeVectorD.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoTrack.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoTrack.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoTrackCollection.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoTrackCut.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoTypes.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoV0.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoV0.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoV0Collection.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoV0Cut.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoVector.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoVertexAnalysis.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoVertexAnalysis.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoVertexMultAnalysis.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoVertexMultAnalysis.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoXi.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoXi.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoXiCollection.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFemtoXiCut.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFmHelix.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFmHelix.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFmHelixD.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFmLorentzVector.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFmLorentzVectorD.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFmPhysicalHelix.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFmPhysicalHelix.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFmPhysicalHelixD.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFmThreeVector.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFmThreeVectorD.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliFmThreeVectorF.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliTwoTrackRes.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/AliTwoTrackRes.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/PhysicalConstants.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/SystemOfUnits.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/TpcLocalTransform.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemto/TpcLocalTransform.h [deleted file]
PWG2/FEMTOSCOPY/AliFemto/phys_constants.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoBPLCMS3DCorrFctnEMCIC.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoBPLCMS3DCorrFctnEMCIC.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoChi2CorrFctn.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoChi2CorrFctn.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctn3DSphericalEMCIC.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctn3DSphericalEMCIC.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDEtaDPhi.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDEtaDPhi.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDirectYlm.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDirectYlm.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnGammaMonitor.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnGammaMonitor.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnTPCNcls.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnTPCNcls.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorParticleEtCorr.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorParticleEtCorr.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorParticleMomRes.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorParticleMomRes.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorParticlePtPDG.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorParticlePtPDG.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorTrackTPCchiNdof.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorTrackTPCchiNdof.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorTrackTPCncls.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorTrackTPCncls.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoESDTrackCut.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoESDTrackCut.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoEventReaderESDKine.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoEventReaderESDKine.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoModelAllHiddenInfo.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoModelAllHiddenInfo.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoModelBPLCMSCorrFctn.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoModelBPLCMSCorrFctn.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctn3DLCMSSpherical.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctn3DLCMSSpherical.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctn3DSpherical.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctn3DSpherical.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnDEtaDPhi.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnDEtaDPhi.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnDirectYlm.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnDirectYlm.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnNonIdDR.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnNonIdDR.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnSource.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnSource.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnTrueQ.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnTrueQ.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoModelGausRinvFreezeOutGenerator.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoModelGausRinvFreezeOutGenerator.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoPairCutAntiGamma.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoPairCutAntiGamma.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoPairCutPt.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoPairCutPt.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoPairCutRadialDistance.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoPairCutRadialDistance.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoQAEventCut.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoQAEventCut.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoQATrackCut.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoQATrackCut.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoQPairCut.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoQPairCut.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoQinvCorrFctnEMCIC.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoQinvCorrFctnEMCIC.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityCorrFctn.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityCorrFctn.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityKTPairCut.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityKTPairCut.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityPairCut.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityPairCut.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityQAPairCut.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityQAPairCut.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityTPCEntranceSepPairCut.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityTPCEntranceSepPairCut.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityTPCEntranceSepQAPairCut.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityTPCEntranceSepQAPairCut.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoTPCInnerCorrFctn.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoTPCInnerCorrFctn.h [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoYlm.cxx [deleted file]
PWG2/FEMTOSCOPY/AliFemtoUser/AliFemtoYlm.h [deleted file]
PWG2/FEMTOSCOPY/Documentation/AliFemto.pdf [deleted file]
PWG2/FEMTOSCOPY/Documentation/AliFemto.tex [deleted file]
PWG2/FEMTOSCOPY/Documentation/AliFemtoTitle.pdf [deleted file]
PWG2/FEMTOSCOPY/Documentation/Analysis.pdf [deleted file]
PWG2/FEMTOSCOPY/Documentation/ExampleMacro1.pdf [deleted file]
PWG2/FEMTOSCOPY/Documentation/ExampleMacro2.pdf [deleted file]
PWG2/FEMTOSCOPY/Documentation/ExampleMacro3.pdf [deleted file]
PWG2/FEMTOSCOPY/Documentation/ExampleMacro4.pdf [deleted file]
PWG2/FEMTOSCOPY/Documentation/ExampleMacro5.pdf [deleted file]
PWG2/FEMTOSCOPY/Documentation/TopLevelUML.pdf [deleted file]
PWG2/FEMTOSCOPY/macros/AddTaskFemto.C [deleted file]
PWG2/FEMTOSCOPY/macros/Batch/ConfigFemtoAnalysis.C [deleted file]
PWG2/FEMTOSCOPY/macros/Batch/runBatch.C [deleted file]
PWG2/FEMTOSCOPY/macros/BatchMC/runBatch.C [deleted file]
PWG2/FEMTOSCOPY/macros/ConfigFemtoAnalysis.C [deleted file]
PWG2/FEMTOSCOPY/macros/Local/AliFemtoSplittingMergingQA.C [deleted file]
PWG2/FEMTOSCOPY/macros/Local/runLocal.C [deleted file]
PWG2/FEMTOSCOPY/macros/Proof/runProof.C [deleted file]
PWG2/FEMTOSCOPY/macros/Train/AddTaskFemto.C [deleted file]
PWG2/FEMTOSCOPY/macros/Train/DEtaDPhi/ConfigFemtoAnalysis.C [deleted file]
PWG2/FEMTOSCOPY/macros/Train/DEtaDPhiKaons/ConfigFemtoAnalysis.C [deleted file]
PWG2/FEMTOSCOPY/macros/Train/DEtaDPhiNoPID/ConfigFemtoAnalysis.C [deleted file]
PWG2/FEMTOSCOPY/macros/Train/DataTrain1/ConfigFemtoAnalysis.C [deleted file]
PWG2/FEMTOSCOPY/macros/Train/PWG2FemtoExercise1/ConfigFemtoAnalysis.C [deleted file]
PWG2/FEMTOSCOPY/macros/Train/PWG2FemtoExercise1/runBatch.C [deleted file]
PWG2/FEMTOSCOPY/macros/Train/PWG2FemtoExercise1/runLocal.C [deleted file]
PWG2/FEMTOSCOPY/macros/Train/PWG2Train2/ConfigFemtoAnalysis.C [deleted file]
PWG2/FEMTOSCOPY/macros/Train/PWG2TrainLHC10a6/ConfigFemtoAnalysis.C [deleted file]
PWG2/FEMTOSCOPY/macros/Train/PionsFemtoscopy/ConfigFemtoAnalysis.C [deleted file]
PWG2/FEMTOSCOPY/macros/Train/ProtonFemtoscopy/ConfigFemtoAnalysis.C [deleted file]
PWG2/FEMTOSCOPY/macros/Train/ProtonFemtoscopy/runBatch.C [deleted file]
PWG2/FEMTOSCOPY/macros/Train/Train3/ConfigFemtoAnalysis.C [deleted file]
PWG2/FEMTOSCOPY/macros/Train/TwoTrackQA/ConfigFemtoAnalysis.C [deleted file]
PWG2/FEMTOSCOPY/macros/Train/TwoTrackQA/ConfigFemtoAnalysisCentral.C [deleted file]
PWG2/FEMTOSCOPY/macros/Train/TwoTrackQA/FemtoQAPlots.C [deleted file]
PWG2/PWG2AODLinkDef.h [deleted file]
PWG2/PWG2femtoscopyLinkDef.h [deleted file]
PWG2/PWG2femtoscopyUserLinkDef.h [deleted file]

diff --git a/PWG2/CMakelibPWG2AOD.pkg b/PWG2/CMakelibPWG2AOD.pkg
deleted file mode 100644 (file)
index 5ad7d78..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- mode: CMake -*-
-#-----------------------------------------------------------------------#
-# Package File for PWG2AOD                                              #
-# Author : Johny Jose (johny.jose@cern.ch)                              #
-# Variables Defined :                                                   #
-#                                                                       #
-# SRCS - C++ source files                                               #
-# HDRS - C++ header files                                               #
-# DHDR - ROOT Dictionary Linkdef header file                            #
-# CSRCS - C source files                                                #
-# CHDRS - C header files                                                #
-# EINCLUDE - Include directories                                        #
-# EDEFINE - Compiler definitions                                        #
-# ELIBS - Extra libraries to link                                       #
-# ELIBSDIR - Extra library directories                                  #
-# PACKFFLAGS - Fortran compiler flags for package                       #
-# PACKCXXFLAGS - C++ compiler flags for package                         #
-# PACKCFLAGS - C compiler flags for package                             #
-# PACKSOFLAGS - Shared library linking flags                            #
-# PACKLDFLAGS - Module linker flags                                     #
-# PACKBLIBS - Libraries to link (Executables only)                      #
-# EXPORT - Header files to be exported                                  #
-# CINTHDRS - Dictionary header files                                    #
-# CINTAUTOLINK - Set automatic dictionary generation                    #
-# ARLIBS - Archive Libraries and objects for linking (Executables only) #
-# SHLIBS - Shared Libraries and objects for linking (Executables only)  #
-#-----------------------------------------------------------------------#
-
-set ( SRCS  
-    AOD/AliPWG2AODTrack.cxx 
-    AOD/AliAnalysisTaskPWG2ESDfilter.cxx 
-    AOD/AliAnalysisTaskPWG2AODUpdate.cxx 
-    )
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR PWG2AODLinkDef.h)
-
-set ( EXPORT )
-
-set ( EINCLUDE  PYTHIA6 PWG2/AOD STEER/AOD STEER/STEERBase)
-
-install (FILES centraltrain/AnalysisTrainPWG2.C 
-         DESTINATION PWG2/centraltrain)
-
-#
-# EOF
-#
diff --git a/PWG2/CMakelibPWG2femtoscopy.pkg b/PWG2/CMakelibPWG2femtoscopy.pkg
deleted file mode 100644 (file)
index a3ca1b4..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-# -*- mode: CMake -*-
-#------------------------------------------------------------------------#
-# Package File for PWG2femtoscopy                                        #
-# Author : Johny Jose (johny.jose@cern.ch)                               #
-# Variables Defined :                                                    #
-#                                                                        #
-# SRCS - C++ source files                                                #
-# HDRS - C++ header files                                                #
-# DHDR - ROOT Dictionary Linkdef header file                             #
-# CSRCS - C source files                                                 #
-# CHDRS - C header files                                                 #
-# EINCLUDE - Include directories                                         #
-# EDEFINE - Compiler definitions                                         #
-# ELIBS - Extra libraries to link                                        #
-# ELIBSDIR - Extra library directories                                   #
-# PACKFFLAGS - Fortran compiler flags for package                        #
-# PACKCXXFLAGS - C++ compiler flags for package                          #
-# PACKCFLAGS - C compiler flags for package                              #
-# PACKSOFLAGS - Shared library linking flags                             #
-# PACKLDFLAGS - Module linker flags                                      #
-# PACKBLIBS - Libraries to link (Executables only)                       #
-# EXPORT - Header files to be exported                                   #
-# CINTHDRS - Dictionary header files                                     #
-# CINTAUTOLINK - Set automatic dictionary generation                     #
-# ARLIBS - Archive Libraries and objects for linking (Executables only)  #
-# SHLIBS - Shared Libraries and objects for linking (Executables only)   #
-#------------------------------------------------------------------------#
-
-set ( SRCS  
-    FEMTOSCOPY/AliFemto/AliFemtoSimpleAnalysis.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoLikeSignAnalysis.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoVertexAnalysis.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoVertexMultAnalysis.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoAnalysisAzimuthal.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoAnalysisReactionPlane.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoBPLCMS3DCorrFctn.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoCorrFctn3DLCMSSym.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoQinvCorrFctn.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoBasicEventCut.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoEventCutEstimators.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoBasicTrackCut.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoDummyPairCut.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoCoulomb.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoCutMonitorHandler.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoEvent.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoKink.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoManager.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoPair.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoParticle.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoPicoEvent.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoPicoEventCollectionVectorHideAway.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoTrack.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoV0.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoXi.cxx 
-    FEMTOSCOPY/AliFemto/AliFmHelix.cxx 
-    FEMTOSCOPY/AliFemto/AliFmPhysicalHelix.cxx 
-    FEMTOSCOPY/AliFemto/TpcLocalTransform.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoEventReader.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoEventReaderStandard.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoEventReaderESD.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoEventReaderESDChain.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoEventReaderESDChainKine.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoModelHiddenInfo.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoModelGlobalHiddenInfo.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoModelGausLCMSFreezeOutGenerator.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoModelWeightGenerator.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoModelWeightGeneratorBasic.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoModelManager.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoModelCorrFctn.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoModelFreezeOutGenerator.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoModelWeightGeneratorLednicky.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticleYPt.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticleVertPos.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticlePID.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoCutMonitorEventMult.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoCutMonitorEventVertex.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoKTPairCut.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoCorrFctnNonIdDR.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoCorrFctn3DSpherical.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoEventReaderAOD.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoEventReaderAODChain.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoAODTrackCut.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoCutMonitor.cxx 
-    FEMTOSCOPY/AliFemto/AliFemtoCorrFctn.cxx 
-    FEMTOSCOPY/AliFemto/AliAnalysisTaskFemto.cxx 
-    FEMTOSCOPY/AliFemto/AliTwoTrackRes.cxx
-    FEMTOSCOPY/AliFemto/AliFemtoMCTrackCut.cxx
-    FEMTOSCOPY/AliFemto/AliFemtoEventReaderKinematicsChain.cxx
-    )
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( HDRS ${HDRS}  
-    FEMTOSCOPY/AliFemto/AliFmThreeVector.h 
-    FEMTOSCOPY/AliFemto/AliFmThreeVectorF.h 
-    FEMTOSCOPY/AliFemto/AliFmThreeVectorD.h 
-    FEMTOSCOPY/AliFemto/AliFmPhysicalHelixD.h 
-    FEMTOSCOPY/AliFemto/AliFmHelixD.h 
-    FEMTOSCOPY/AliFemto/AliFmLorentzVectorD.h 
-    FEMTOSCOPY/AliFemto/AliFemtoV0Cut.h 
-    FEMTOSCOPY/AliFemto/AliFemtoKinkCut.h 
-    FEMTOSCOPY/AliFemto/AliFemtoXiCut.h 
-    FEMTOSCOPY/AliFemto/AliFemtoAnalysisCollection.h 
-    FEMTOSCOPY/AliFemto/AliFemtoAnalysis.h 
-    FEMTOSCOPY/AliFemto/AliFemtoCorrFctnCollection.h 
-    FEMTOSCOPY/AliFemto/AliFemtoEnumeration.h 
-    FEMTOSCOPY/AliFemto/AliFemtoHelix.h 
-    FEMTOSCOPY/AliFemto/AliFemtoHiddenInfo.h 
-    FEMTOSCOPY/AliFemto/AliFemtoLikeSignCorrFctn.h 
-    FEMTOSCOPY/AliFemto/AliFemtoLorentzVector.h 
-    FEMTOSCOPY/AliFemto/AliFemtoString.h 
-    FEMTOSCOPY/AliFemto/AliFemtoThreeVectorD.h 
-    FEMTOSCOPY/AliFemto/AliFemtoThreeVector.h 
-    FEMTOSCOPY/AliFemto/AliFemtoTypes.h 
-    FEMTOSCOPY/AliFemto/AliFemtoVector.h 
-    FEMTOSCOPY/AliFemto/AliFmLorentzVector.h 
-    FEMTOSCOPY/AliFemto/phys_constants.h 
-    FEMTOSCOPY/AliFemto/PhysicalConstants.h 
-    FEMTOSCOPY/AliFemto/SystemOfUnits.h 
-    FEMTOSCOPY/AliFemto/AliFemtoPairCut.h 
-    FEMTOSCOPY/AliFemto/AliFemtoEventCut.h 
-    FEMTOSCOPY/AliFemto/AliFemtoParticleCut.h 
-    FEMTOSCOPY/AliFemto/AliFemtoTrackCollection.h 
-    FEMTOSCOPY/AliFemto/AliFemtoV0Collection.h 
-    FEMTOSCOPY/AliFemto/AliFemtoXiCollection.h 
-    FEMTOSCOPY/AliFemto/AliFemtoKinkCollection.h 
-    FEMTOSCOPY/AliFemto/AliFemtoPicoEventCollection.h 
-    FEMTOSCOPY/AliFemto/AliFemtoParticleCollection.h 
-    FEMTOSCOPY/AliFemto/AliFemtoCutMonitorCollection.h 
-    FEMTOSCOPY/AliFemto/AliFemtoTrackCut.h 
-    FEMTOSCOPY/AliFemto/AliFemtoPicoEventCollectionVector.h 
-    FEMTOSCOPY/AliFemto/AliFemtoEventWriter.h 
-    FEMTOSCOPY/AliFemto/AliFemtoEventWriterCollection.h 
-    FEMTOSCOPY/AliFemto/AliFemtoMCTrackCut.h
-    FEMTOSCOPY/AliFemto/AliFemtoEventReaderKinematicsChain.h
-    )
-
-set ( FSRCS  FEMTOSCOPY/AliFemto/AliFemtoFsiTools.F FEMTOSCOPY/AliFemto/AliFemtoFsiWeightLednicky.F)
-
-set ( DHDR  PWG2femtoscopyLinkDef.h)
-
-set ( EXPORT )
-
-set ( EINCLUDE  PWG3/FEMTOSCOPY/AliFemto PWG2/AOD PWG2/FORWARD/analysis STEER/AOD STEER/ESD STEER/STEERBase)
-
-install (DIRECTORY FEMTOSCOPY/macros
-         DESTINATION PWG2/FEMTOSCOPY 
-         PATTERN .svn EXCLUDE)
-
-#
-# EOF
-#
diff --git a/PWG2/CMakelibPWG2femtoscopyUser.pkg b/PWG2/CMakelibPWG2femtoscopyUser.pkg
deleted file mode 100644 (file)
index 39b5d62..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-#--------------------------------------------------------------------------------#
-# Package File for PWG2femtoscopyUser                                            #
-# Author : Johny Jose (johny.jose@cern.ch)                                       #
-# Variables Defined :                                                            #
-#                                                                                #
-# SRCS - C++ source files                                                        #
-# HDRS - C++ header files                                                        #
-# DHDR - ROOT Dictionary Linkdef header file                                     #
-# CSRCS - C source files                                                         #
-# CHDRS - C header files                                                         #
-# EINCLUDE - Include directories                                                 #
-# EDEFINE - Compiler definitions                                                 #
-# ELIBS - Extra libraries to link                                                #
-# ELIBSDIR - Extra library directories                                           #
-# PACKFFLAGS - Fortran compiler flags for package                                #
-# PACKCXXFLAGS - C++ compiler flags for package                                  #
-# PACKCFLAGS - C compiler flags for package                                      #
-# PACKSOFLAGS - Shared library linking flags                                     #
-# PACKLDFLAGS - Module linker flags                                              #
-# PACKBLIBS - Libraries to link (Executables only)                               #
-# EXPORT - Header files to be exported                                           #
-# CINTHDRS - Dictionary header files                                             #
-# CINTAUTOLINK - Set automatic dictionary generation                             #
-# ARLIBS - Archive Libraries and objects for linking (Executables only)          #
-# SHLIBS - Shared Libraries and objects for linking (Executables only)           #
-#--------------------------------------------------------------------------------#
-
-set ( SRCS  FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityPairCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityKTPairCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityTPCEntranceSepPairCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoESDTrackCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoTPCInnerCorrFctn.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoChi2CorrFctn.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnSource.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnDEtaDPhi.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelBPLCMSCorrFctn.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelGausRinvFreezeOutGenerator.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnTrueQ.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnNonIdDR.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctn3DSpherical.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctn3DLCMSSpherical.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorParticleMomRes.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelAllHiddenInfo.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorTrackTPCchiNdof.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoQATrackCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoQAEventCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorTrackTPCncls.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityTPCEntranceSepQAPairCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityQAPairCut.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoShareQualityCorrFctn.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoYlm.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDirectYlm.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoModelCorrFctnDirectYlm.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorParticlePtPDG.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnTPCNcls.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnDEtaDPhi.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctnGammaMonitor.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoQinvCorrFctnEMCIC.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCorrFctn3DSphericalEMCIC.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoBPLCMS3DCorrFctnEMCIC.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoPairCutAntiGamma.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoCutMonitorParticleEtCorr.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoPairCutRadialDistance.cxx FEMTOSCOPY/AliFemtoUser/AliFemtoPairCutPt.cxx)
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR  PWG2femtoscopyUserLinkDef.h)
-
-set ( EXPORT )
-
-set ( EINCLUDE  PWG2/AOD PWG2/FEMTOSCOPY/AliFemto PWG2/FEMTOSCOPY/AliFemtoUser)
-if( ALICE_TARGET STREQUAL "win32gcc")
-       
-               set ( PACKSOFLAGS  ${SOFLAGS} -L${ALICE_ROOT}/lib/tgt_${ALICE_TARGET} -lPWG2AOD -lPWG2femtoscopy)
-
-endif( ALICE_TARGET STREQUAL "win32gcc")
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliAnalysisTaskFemto.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliAnalysisTaskFemto.cxx
deleted file mode 100644 (file)
index fe3e52b..0000000
+++ /dev/null
@@ -1,516 +0,0 @@
-//------------------------------------------------------
-// AliAnalysisTaskFemto - A task for the analysis framework
-// from the FEMTOSCOPY analysis of PWG2. Creates the necessary
-// connection between the ESD or AOD input and the femtoscopic
-// code.
-// Author: Adam Kisiel, OSU; Adam.Kisiel@cern.ch
-//------------------------------------------------------
-#include "TROOT.h"
-#include "TChain.h"
-#include "TH1.h"
-#include "TCanvas.h"
-#include "TSystem.h"
-#include "TFile.h"
-#include "TInterpreter.h"
-
-#include "AliAnalysisTask.h"
-
-#include "AliESDEvent.h"
-
-#include "AliFemtoAnalysis.h"
-#include "AliAnalysisTaskFemto.h"
-#include "AliVHeader.h"
-#include "AliGenEventHeader.h"
-#include "AliGenHijingEventHeader.h"
-#include "AliGenCocktailEventHeader.h"
-
-ClassImp(AliAnalysisTaskFemto)
-
-// Default name for the setup macro of femto analysis  
-// This function MUST be defined in the separate file !!!
-// extern AliFemtoManager *ConfigFemtoAnalysis();
-
-//________________________________________________________________________
-AliAnalysisTaskFemto::AliAnalysisTaskFemto(const char *name, const char *aConfigMacro, const char *aConfigParams):
-    AliAnalysisTask(name,""), 
-    fESD(0), 
-    fESDpid(0),
-    fAOD(0),
-    fAODpidUtil(0),
-    fStack(0),
-    fOutputList(0), 
-    fReader(0x0),
-    fManager(0x0),
-    fAnalysisType(0),
-    fConfigMacro(0),
-    fConfigParams(0)
-{
-  // Constructor.
-  // Input slot #0 works with an Ntuple
-  DefineInput(0, TChain::Class());
-  // Output slot #0 writes into a TH1 container
-  DefineOutput(0, TList::Class());
-  fConfigMacro = (char *) malloc(sizeof(char) * strlen(aConfigMacro));
-  strcpy(fConfigMacro, aConfigMacro);
-  fConfigParams = (char *) malloc(sizeof(char) * strlen(aConfigParams));
-  strcpy(fConfigParams, aConfigParams);
-}
-//________________________________________________________________________
-AliAnalysisTaskFemto::AliAnalysisTaskFemto(const char *name, const char *aConfigMacro="ConfigFemtoAnalysis.C"): 
-    AliAnalysisTask(name,""), 
-    fESD(0), 
-    fESDpid(0),
-    fAOD(0),
-    fAODpidUtil(0),
-    fStack(0),
-    fOutputList(0), 
-    fReader(0x0),
-    fManager(0x0),
-    fAnalysisType(0),
-    fConfigMacro(0),
-    fConfigParams(0)
-{
-  // Constructor.
-  // Input slot #0 works with an Ntuple
-  DefineInput(0, TChain::Class());
-  // Output slot #0 writes into a TH1 container
-  DefineOutput(0, TList::Class());
-  fConfigMacro = (char *) malloc(sizeof(char) * strlen(aConfigMacro));
-  strcpy(fConfigMacro, aConfigMacro);
-  fConfigParams = (char *) malloc(sizeof(char) * 2);
-  strcpy(fConfigParams, "");
-}
-
-AliAnalysisTaskFemto::AliAnalysisTaskFemto(const AliAnalysisTaskFemto& aFemtoTask):
-    AliAnalysisTask(aFemtoTask), 
-    fESD(0), 
-    fESDpid(0),
-    fAOD(0),
-    fAODpidUtil(0),
-    fStack(0),
-    fOutputList(0), 
-    fReader(0x0),
-    fManager(0x0),
-    fAnalysisType(0),
-    fConfigMacro(0),
-    fConfigParams(0)
-{
-  // copy constructor
-  fESD = aFemtoTask.fESD; 
-  fESDpid = aFemtoTask.fESDpid; 
-  fAOD = aFemtoTask.fAOD; 
-  fAODpidUtil = aFemtoTask.fAODpidUtil;
-  fStack = aFemtoTask.fStack;
-  fOutputList = aFemtoTask.fOutputList;   
-  fReader = aFemtoTask.fReader;       
-  fManager = aFemtoTask.fManager;      
-  fAnalysisType = aFemtoTask.fAnalysisType; 
-  fConfigMacro = (char *) malloc(sizeof(char) * strlen(aFemtoTask.fConfigMacro));
-  strcpy(fConfigMacro, aFemtoTask.fConfigMacro);
-  fConfigParams = (char *) malloc(sizeof(char) * strlen(aFemtoTask.fConfigParams));
-  strcpy(fConfigParams, aFemtoTask.fConfigParams);
-}
-
-
-AliAnalysisTaskFemto& AliAnalysisTaskFemto::operator=(const AliAnalysisTaskFemto& aFemtoTask){
-  // assignment operator
-  if (this == &aFemtoTask)
-    return *this;
-
-  fESD = aFemtoTask.fESD; 
-  fESDpid = aFemtoTask.fESDpid;
-  fAOD = aFemtoTask.fAOD; 
-  fAODpidUtil = aFemtoTask.fAODpidUtil;
-  fStack = aFemtoTask.fStack;
-  fOutputList = aFemtoTask.fOutputList;   
-  fReader = aFemtoTask.fReader;       
-  fManager = aFemtoTask.fManager;      
-  fAnalysisType = aFemtoTask.fAnalysisType; 
-  if (fConfigMacro) free(fConfigMacro);
-  fConfigMacro = (char *) malloc(sizeof(char) * strlen(aFemtoTask.fConfigMacro));
-  strcpy(fConfigMacro, aFemtoTask.fConfigMacro);
-  if (fConfigParams) free(fConfigParams);
-  fConfigParams = (char *) malloc(sizeof(char) * strlen(aFemtoTask.fConfigParams));
-  strcpy(fConfigParams, aFemtoTask.fConfigParams);
-
-  return *this;
-}
-
-AliAnalysisTaskFemto::~AliAnalysisTaskFemto() 
-{
-  if (fConfigMacro) free(fConfigMacro);
-  if (fConfigParams) free(fConfigParams);
-}
-
-
-//________________________________________________________________________
-void AliAnalysisTaskFemto::ConnectInputData(Option_t *) {
-  AliInfo(Form("   ConnectInputData %s\n", GetName()));
-
-  fESD = 0;
-  fESDpid = 0;
-  fAOD = 0;
-  fAODpidUtil = 0;
-  fAnalysisType = 0;
-
-  TTree* tree = dynamic_cast<TTree*> (GetInputData(0));
-  if (!tree) {
-    AliWarning("Could not read chain from input slot 0");
-    return;
-  } 
-
-  AliFemtoEventReaderESDChain *femtoReader = dynamic_cast<AliFemtoEventReaderESDChain *> (fReader);
-  if ((dynamic_cast<AliFemtoEventReaderESDChain *> (fReader))) {
-    AliESDInputHandler *esdH = dynamic_cast<AliESDInputHandler*> (AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler());
-    
-    if(esdH) {
-      AliInfo("Selected ESD analysis");
-      fAnalysisType = 1;
-      
-//       if (!esdH) {
-//     AliWarning("Could not get ESDInputHandler");
-//       } 
-//       else {
-       fESD = esdH->GetEvent();
-        fESDpid = esdH->GetESDpid();
-        femtoReader->SetESDPid(fESDpid);
-//       }
-    }
-}
-  else if ((dynamic_cast<AliFemtoEventReaderKinematicsChain *> (fReader))) {
-    AliESDInputHandler *esdH = dynamic_cast<AliESDInputHandler*> (AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler());
-    
-    if(esdH) {
-      AliInfo("Selected ESD analysis");
-      fAnalysisType = 1;
-      
-//       if (!esdH) {
-//     AliWarning("Could not get ESDInputHandler");
-//       } 
-//       else {
-       fESD = esdH->GetEvent();
-        //fESDpid = esdH->GetESDpid();
-        //femtoReader->SetESDPid(fESDpid);
-//       }
-    }
-  }
-
-
-  AliFemtoEventReaderESDChainKine *femtoReaderESDKine = dynamic_cast<AliFemtoEventReaderESDChainKine *> (fReader);
-  if ((dynamic_cast<AliFemtoEventReaderESDChainKine *> (fReader))) {
-    AliESDInputHandler *esdH = dynamic_cast<AliESDInputHandler*> (AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler());
-    
-    if(esdH) {
-      AliInfo("Selected ESD analysis");
-      fAnalysisType = 1;
-      
-//       if (!esdH) {
-//     AliWarning("Could not get ESDInputHandler");
-//       } 
-//       else {
-       fESD = esdH->GetEvent();
-        fESDpid = esdH->GetESDpid();
-        femtoReaderESDKine->SetESDPid(fESDpid);
-//       }
-    }
-}
-
-  //  AliFemtoEventReaderKinematicsChain *femtoReaderKine = dynamic_cast<AliFemtoEventReaderKinematicsChain *> (fReader);
-  if ((dynamic_cast<AliFemtoEventReaderKinematicsChain *> (fReader))) {
-    AliESDInputHandler *esdH = dynamic_cast<AliESDInputHandler*> (AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler());
-    
-    if(esdH) {
-      AliInfo("Selected ESD analysis");
-      fAnalysisType = 1;
-      
-      //       if (!esdH) {
-      //       AliWarning("Could not get ESDInputHandler");
-      //       } 
-      //       else {
-      fESD = esdH->GetEvent();
-      //fESDpid = esdH->GetESDpid();
-      //femtoReader->SetESDPid(fESDpid);
-      //       }
-    }
-  }
-  
-  
-  AliFemtoEventReaderAODChain *femtoReaderAOD = dynamic_cast<AliFemtoEventReaderAODChain *> (fReader);
-  if (dynamic_cast<AliFemtoEventReaderAODChain *> (fReader)) {
-    AliAODInputHandler *aodH = dynamic_cast<AliAODInputHandler*> (AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler());
-    
-    if (!aodH) {
-      TObject *handler = AliAnalysisManager::GetAnalysisManager()->GetOutputEventHandler();
-      AliInfo("Has output handler ");
-      if( handler && handler->InheritsFrom("AliAODHandler") ) {
-       AliInfo("Selected AOD analysis");
-       
-       fAOD = ((AliAODHandler*)handler)->GetAOD();
-       fAnalysisType = 2;
-      }
-      else {
-       AliWarning("Selected AOD reader but no AOD handler found");
-      }
-    } 
-    else {
-      AliInfo("Selected AOD analysis");
-      fAnalysisType = 2;
-      
-      fAOD = aodH->GetEvent();
-
-      fAODpidUtil = aodH->GetAODpidUtil();
-      //      printf("aodH->GetAODpidUtil(): %x",aodH->GetAODpidUtil());
-      femtoReaderAOD->SetAODpidUtil(fAODpidUtil);
-    }
-  }
-
-  if ((!fAOD) && (!fESD)) {
-    AliWarning("Wrong analysis type: Only ESD and AOD types are allowed!");
-  }
-}
-
-//________________________________________________________________________
-void AliAnalysisTaskFemto::CreateOutputObjects() {
-  AliInfo("Creating Femto Analysis objects\n");
-
-  gSystem->SetIncludePath("-I$ROOTSYS/include -I./STEERBase/ -I./ESD/ -I./AOD/ -I./ANALYSIS/ -I./ANALYSISalice/ -I./PWG2AOD/AOD -I./PWG2femtoscopy/FEMTOSCOPY/AliFemto -I./PWG2femtoscopyUser/FEMTOSCOPY/AliFemtoUser");
-  //  char fcm[2000];
-//   sprintf(fcm, "%s++", fConfigMacro);
-//   gROOT->LoadMacro(fcm);
-  gROOT->LoadMacro(fConfigMacro);
-  //  fJetFinder = (AliJetFinder*) gInterpreter->ProcessLine("ConfigJetAnalysis()");
-  if (!fConfigParams)
-    SetFemtoManager((AliFemtoManager *) gInterpreter->ProcessLine("ConfigFemtoAnalysis()"));
-  else
-    SetFemtoManager((AliFemtoManager *) gInterpreter->ProcessLine(Form("ConfigFemtoAnalysis(%s)", fConfigParams)));
-
-  TList *tOL;
-  fOutputList = fManager->Analysis(0)->GetOutputList();
-
-  for (unsigned int ian = 1; ian<fManager->AnalysisCollection()->size(); ian++) {
-    tOL = fManager->Analysis(ian)->GetOutputList();
-
-    TIter nextListCf(tOL);
-    while (TObject *obj = nextListCf()) {
-      fOutputList->Add(obj);
-    }
-
-    delete tOL;
-  }
-
-  PostData(0, fOutputList);
-}
-
-//________________________________________________________________________
-void AliAnalysisTaskFemto::Exec(Option_t *) {
-  // Task making a femtoscopic analysis.
-
-  if (fAnalysisType==1) {
-    if (!fESD) {
-      AliWarning("fESD not available");
-      return;
-    }
-
-    //Get MC data
-    AliMCEventHandler*    mctruth = (AliMCEventHandler*) 
-      ((AliAnalysisManager::GetAnalysisManager())->GetMCtruthEventHandler());
-    
-    AliGenHijingEventHeader *hdh = 0;
-    if(mctruth) {
-      fStack = mctruth->MCEvent()->Stack();
-
-      AliGenCocktailEventHeader *hd = dynamic_cast<AliGenCocktailEventHeader *> (mctruth->MCEvent()->GenEventHeader());
-      
-      if (hd) {
-       
-       //      AliInfo ("Got MC cocktail event header %p\n", (void *) hd);
-       TList *lhd = hd->GetHeaders();
-       //      AliInfo ("Got list of headers %d\n", lhd->GetEntries());
-       
-       for (int iterh=0; iterh<lhd->GetEntries(); iterh++) 
-         {
-           hdh = dynamic_cast<AliGenHijingEventHeader *> (lhd->At(iterh));
-           //      AliInfo ("HIJING header at %i is %p\n", iterh, (void *) hdh);
-         }
-      }    
-    }
-
-    // Get ESD
-    AliESDInputHandler *esdH = dynamic_cast<AliESDInputHandler*> (AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler());
-    
-    if (!esdH) {
-      AliWarning("Could not get ESDInputHandler");
-      return;
-    } 
-    else {
-      fESD = esdH->GetEvent();
-      fESDpid = esdH->GetESDpid();   
-    }
-
-    AliInfo(Form("Tracks in ESD: %d \n",fESD->GetNumberOfTracks()));
-
-    if (fESD->GetNumberOfTracks() >= 0) {
-    
-      if (!fReader) {
-       AliWarning("No ESD reader for ESD analysis !\n");
-      }
-      
-      AliFemtoEventReaderESDChain* fesdc = dynamic_cast<AliFemtoEventReaderESDChain *> (fReader);
-      if (fesdc)
-       {
-         // Process the event with no Kine information
-         fesdc->SetESDSource(fESD);
-         fManager->ProcessEvent();
-       }
-
-       AliFemtoEventReaderKinematicsChain* fkinec = dynamic_cast<AliFemtoEventReaderKinematicsChain *> (fReader);
-      if (fkinec)
-       {
-         // Process the event with Kine information only
-         fkinec->SetStackSource(fStack);
-         fManager->ProcessEvent();
-       }
-
-
-      AliFemtoEventReaderESDChainKine* fesdck = dynamic_cast<AliFemtoEventReaderESDChainKine *> (fReader);
-      if (fesdck) 
-       {
-         // Process the event with Kine information
-         fesdck->SetESDSource(fESD);
-         fesdck->SetStackSource(fStack);
-         
-         fesdck->SetGenEventHeader(hdh);
-         fManager->ProcessEvent();
-       }
-      AliFemtoEventReaderStandard* fstd = dynamic_cast<AliFemtoEventReaderStandard *> (fReader);
-      if (fstd) 
-       {
-         // Process the event with Kine information
-         fstd->SetESDSource(fESD);
-         if (mctruth) {
-           fstd->SetStackSource(fStack);
-           fstd->SetGenEventHeader(hdh);
-           fstd->SetInputType(AliFemtoEventReaderStandard::kESDKine);
-         }
-         else
-           fstd->SetInputType(AliFemtoEventReaderStandard::kESD);
-         fManager->ProcessEvent();
-       }
-    } 
-
-    // Post the output histogram list
-    PostData(0, fOutputList);
-  }
-
-  if (fAnalysisType==2) {    
-    if (!fAOD) {
-      AliWarning("fAOD not available");
-      return;
-    }
-
-    // Get AOD
-//     AliAODInputHandler *aodH = dynamic_cast<AliAODInputHandler*> (AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler());
-      
-//     if (!aodH) {
-//       AliWarning("Could not get AODInputHandler");
-//       return;
-//     } 
-//     else {
-
-//       fAOD = aodH->GetEvent();
-//     }
-
-    AliInfo(Form("Tracks in AOD: %d \n",fAOD->GetNumberOfTracks()));
-    
-    if (fAOD->GetNumberOfTracks() > 0) {
-      if (!fReader) {
-       AliWarning("No AOD reader for AOD analysis! \n");
-      }
-      else {
-       AliFemtoEventReaderAODChain* faodc = dynamic_cast<AliFemtoEventReaderAODChain *> (fReader);
-
-       if (faodc) {
-         // Process the event
-         faodc->SetAODSource(fAOD);
-         fManager->ProcessEvent();
-       }
-       AliFemtoEventReaderStandard* fstd = dynamic_cast<AliFemtoEventReaderStandard *> (fReader);
-
-       if (fstd) {
-         // Process the event
-         fstd->SetAODSource(fAOD);
-         fstd->SetInputType(AliFemtoEventReaderStandard::kAOD);
-         fManager->ProcessEvent();
-       }
-      }
-    } 
-
-    // Post the output histogram list
-    PostData(0, fOutputList);
-  }
-}      
-
-//________________________________________________________________________
-void AliAnalysisTaskFemto::Terminate(Option_t *) {
-  // Do the final processing
-  if (fManager) {
-    fManager->Finish();
-  }
-}
-//________________________________________________________________________
-void AliAnalysisTaskFemto:: FinishTaskOutput() {
-  // Do the final processing
-  if (fManager) {
-    fManager->Finish();
-  }
-}
-//________________________________________________________________________
-void AliAnalysisTaskFemto::SetFemtoReaderESD(AliFemtoEventReaderESDChain *aReader)
-{
-  AliInfo("Selecting Femto reader for ESD\n");
-  fReader = aReader;
-}
-//________________________________________________________________________
-void AliAnalysisTaskFemto::SetFemtoReaderESDKine(AliFemtoEventReaderESDChainKine *aReader)
-{
-  AliInfo("Selecting Femto reader for ESD with Kinematics information\n");
-  fReader = aReader;
-}
-//________________________________________________________________________
-void AliAnalysisTaskFemto::SetFemtoReaderAOD(AliFemtoEventReaderAODChain *aReader)
-{
-  AliInfo("Selecting Femto reader for AOD\n");
-  fReader = aReader;
-}
-void AliAnalysisTaskFemto::SetFemtoReaderStandard(AliFemtoEventReaderStandard *aReader)
-{
-  AliInfo("Selecting Standard all-purpose Femto reader\n");
-  fReader = aReader;
-}
-void AliAnalysisTaskFemto::SetFemtoReaderKinematics(AliFemtoEventReaderKinematicsChain *aReader)
-{
-  printf("Selecting Femto reader for Kinematics (Monte Carlo) information\n");
-  fReader = aReader;
-}
-//________________________________________________________________________
-void AliAnalysisTaskFemto::SetFemtoManager(AliFemtoManager *aManager)
-{
-  fManager = aManager;
-  AliInfo(Form("Got reader %p\n", (void *) aManager->EventReader()));
-  AliFemtoEventReaderESDChain     *tReaderESDChain     = dynamic_cast<AliFemtoEventReaderESDChain *> (aManager->EventReader());
-  AliFemtoEventReaderESDChainKine *tReaderESDChainKine = dynamic_cast<AliFemtoEventReaderESDChainKine *> (aManager->EventReader());
-  AliFemtoEventReaderAODChain     *tReaderAODChain     = dynamic_cast<AliFemtoEventReaderAODChain *> (aManager->EventReader());
-  AliFemtoEventReaderStandard     *tReaderStandard     = dynamic_cast<AliFemtoEventReaderStandard *> (aManager->EventReader());
-  AliFemtoEventReaderKinematicsChain *tReaderKineChain = dynamic_cast<AliFemtoEventReaderKinematicsChain *> (aManager->EventReader());
-
- if ((!tReaderESDChain) && (!tReaderESDChainKine) && (!tReaderAODChain) && (!tReaderStandard) && (!tReaderKineChain)) {
-    AliWarning("No AliFemto event reader created. Will not run femto analysis.\n");
-    return;
-  }
-  if (tReaderESDChain) SetFemtoReaderESD(tReaderESDChain);
-  if (tReaderESDChainKine) SetFemtoReaderESDKine(tReaderESDChainKine);
-  if (tReaderAODChain) SetFemtoReaderAOD(tReaderAODChain);
-  if (tReaderStandard) SetFemtoReaderStandard(tReaderStandard);
-  if (tReaderKineChain) SetFemtoReaderKinematics(tReaderKineChain);
-}
-
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliAnalysisTaskFemto.h b/PWG2/FEMTOSCOPY/AliFemto/AliAnalysisTaskFemto.h
deleted file mode 100644 (file)
index 711f450..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-//------------------------------------------------------
-// AliAnalysisTaskFemto - A task for the analysis framework
-// from the FEMTOSCOPY analysis of PWG2. Creates the necessary
-// connection between the ESD or AOD input and the femtoscopic
-// code.
-// Author: Adam Kisiel, OSU; Adam.Kisiel@cern.ch
-//------------------------------------------------------
-#ifndef ALIANALYSISTASKFEMTO_H
-#define ALIANALYSISTASKFEMTO_H
-
-#include "TH1.h"
-
-#include "AliESDInputHandler.h"
-#include "AliAODHandler.h"
-#include "AliAODInputHandler.h"
-#include "AliMCEventHandler.h"
-#include "AliESDEvent.h"
-#include "AliAODEvent.h"
-#include "AliMCEvent.h"
-
-#include "AliAnalysisTask.h"
-#include "AliAnalysisManager.h"
-#include "AliAnalysisDataContainer.h"
-
-#include "AliFemtoEventReaderESDChain.h"
-#include "AliFemtoEventReaderESDChainKine.h"
-#include "AliFemtoEventReaderAODChain.h"
-#include "AliFemtoEventReaderStandard.h"
-#include "AliFemtoEventReaderKinematicsChain.h"
-#include "AliFemtoManager.h"
-
-#include "AliESDpid.h"
-#include "AliAODpidUtil.h"
-
-
-class AliAnalysisTaskFemto : public AliAnalysisTask {
- public:
-  AliAnalysisTaskFemto() : AliAnalysisTask(), fESD(0), fESDpid(0), fAOD(0), fAODpidUtil(0), fStack(0), fOutputList(0), fReader(0x0), fManager(0x0), fAnalysisType(0), fConfigMacro(0), fConfigParams(0) {}
-  AliAnalysisTaskFemto(const char *name, const char *aConfigMacro, const char *aConfigParams);
-  AliAnalysisTaskFemto(const char *name, const char *aConfigMacro);
-  AliAnalysisTaskFemto(const AliAnalysisTaskFemto& aFemtoTask);
-  virtual ~AliAnalysisTaskFemto();
-  
-  AliAnalysisTaskFemto& operator=(const AliAnalysisTaskFemto& aFemtoTask);
-
-  virtual void   ConnectInputData(Option_t *);
-  virtual void   CreateOutputObjects();
-  virtual void   Exec(Option_t *option);
-  virtual void   Terminate(Option_t *);
-  virtual void   FinishTaskOutput();
-
-  void SetFemtoReaderESD(AliFemtoEventReaderESDChain *aReader);
-  void SetFemtoReaderESDKine(AliFemtoEventReaderESDChainKine *aReader);
-  void SetFemtoReaderAOD(AliFemtoEventReaderAODChain *aReader);
-  void SetFemtoReaderStandard(AliFemtoEventReaderStandard *aReader);
-  void SetFemtoManager(AliFemtoManager *aManager);
-  void SetFemtoReaderKinematics(AliFemtoEventReaderKinematicsChain *aReader);
-
- private:
-  AliESDEvent                 *fESD;          //! ESD object
-  AliESDpid                   *fESDpid;       //! ESDpid object
-  AliAODEvent                 *fAOD;          //! AOD object
-  AliAODpidUtil               *fAODpidUtil;   // AliAODpidUtil object
-
-  AliStack                    *fStack;        //! Stack from Kinematics
-  TList                       *fOutputList;   //  AliFemto results list
-  AliFemtoEventReader         *fReader;       //! Reference to the reader
-  AliFemtoManager             *fManager;      //! AliFemto top-level manager 
-  int                          fAnalysisType; //  Mark ESD of AOD analysis
-  char                        *fConfigMacro;  //  Config macro location
-  char                        *fConfigParams; //  Config macro parameters
-
-
-  ClassDef(AliAnalysisTaskFemto, 3); // example of analysis
-};
-
-#endif
-
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoAODTrackCut.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoAODTrackCut.cxx
deleted file mode 100644 (file)
index 2c60d50..0000000
+++ /dev/null
@@ -1,374 +0,0 @@
-/***************************************************************************
- *
- * $Id: AliFemtoAODTrackCut.cxx 23733 2008-02-05 16:51:41Z akisiel $ 
- *
- * 
- ***************************************************************************
- *
- * 
- *              
- *
- ***************************************************************************
- *
- * $Log$
- * Revision 1.3  2007/05/22 09:01:42  akisiel
- * Add the possibiloity to save cut settings in the ROOT file
- *
- * Revision 1.2  2007/05/21 10:38:25  akisiel
- * More coding rule conformance
- *
- * Revision 1.1  2007/05/16 10:25:06  akisiel
- * Making the directory structure of AliFemtoUser flat. All files go into one common directory
- *
- * Revision 1.4  2007/05/03 09:46:10  akisiel
- * Fixing Effective C++ warnings
- *
- * Revision 1.3  2007/04/27 07:25:59  akisiel
- * Make revisions needed for compilation from the main AliRoot tree
- *
- * Revision 1.1.1.1  2007/04/25 15:38:41  panos
- * Importing the HBT code dir
- *
- * Revision 1.4  2007-04-03 16:00:08  mchojnacki
- * Changes to iprove memory managing
- *
- * Revision 1.3  2007/03/13 15:30:03  mchojnacki
- * adding reader for simulated data
- *
- * Revision 1.2  2007/03/08 14:58:03  mchojnacki
- * adding some alice stuff
- *
- * Revision 1.1.1.1  2007/03/07 10:14:49  mchojnacki
- * First version on CVS
- *
- **************************************************************************/
-
-#include "AliFemtoAODTrackCut.h"
-#include <cstdio>
-
-#ifdef __ROOT__ 
-ClassImp(AliFemtoAODTrackCut)
-#endif
-
-
-// electron
-// 0.13 - 1.8
-// 0       7.594129e-02    8.256141e-03
-// 1       -5.535827e-01   8.170825e-02
-// 2       1.728591e+00    3.104210e-01
-// 3       -2.827893e+00   5.827802e-01
-// 4       2.503553e+00    5.736207e-01
-// 5       -1.125965e+00   2.821170e-01
-// 6       2.009036e-01    5.438876e-02
-
-// pion
-// 0.13 - 2.0
-// 0       1.063457e+00    8.872043e-03
-// 1       -4.222208e-01   2.534402e-02
-// 2       1.042004e-01    1.503945e-02
-
-// kaon
-// 0.18 - 2.0
-// 0       -7.289406e-02   1.686074e-03
-// 1       4.415666e-01    1.143939e-02
-// 2       -2.996790e-01   1.840964e-02
-// 3       6.704652e-02    7.783990e-03
-
-// proton
-// 0.26 - 2.0
-// 0       -3.730200e-02   2.347311e-03
-// 1       1.163684e-01    1.319316e-02
-// 2       8.354116e-02    1.997948e-02
-// 3       -4.608098e-02   8.336400e-03
-
-
-AliFemtoAODTrackCut::AliFemtoAODTrackCut() :
-    fCharge(0),
-    fLabel(0),
-    fMaxchiNdof(1000.0),
-    fMaxSigmaToVertex(1000.0),
-    fNTracksPassed(0),
-    fNTracksFailed(0),
-    fMostProbable(0)
-{
-  // Default constructor
-  fNTracksPassed = fNTracksFailed = 0;
-  fCharge = 0;  // takes both charges 0
-  fPt[0]=0.0;              fPt[1] = 100.0;//100
-  fRapidity[0]=-2;       fRapidity[1]=2;//-2 2
-  fPidProbElectron[0]=-1;fPidProbElectron[1]=2;
-  fPidProbPion[0]=-1;    fPidProbPion[1]=2;
-  fPidProbKaon[0]=-1;fPidProbKaon[1]=2;
-  fPidProbProton[0]=-1;fPidProbProton[1]=2;
-  fPidProbMuon[0]=-1;fPidProbMuon[1]=2;
-  fLabel=false;
-}
-//------------------------------
-AliFemtoAODTrackCut::~AliFemtoAODTrackCut(){
-  /* noop */
-}
-//------------------------------
-bool AliFemtoAODTrackCut::Pass(const AliFemtoTrack* track)
-{
-  // test the particle and return 
-  // true if it meets all the criteria
-  // false if it doesn't meet at least one of the criteria
-  float tMost[5];
-  
-  if (((track->ITSchi2() + track->TPCchi2())/(track->ITSncls() + track->TPCncls())) > fMaxchiNdof) {
-    return false;
-  }
-
-  if (fMaxSigmaToVertex < track->SigmaToVertex()) {
-    return false;
-  }
-  
-  if (fLabel)
-    {
-      //cout<<"labels"<<endl;
-      if(track->Label()<0)
-       {
-         fNTracksFailed++;
-         //   cout<<"No Go Through the cut"<<endl;
-         //  cout<<fLabel<<" Label="<<track->Label()<<endl;
-         return false;
-       }    
-    }
-  if (fCharge!=0)
-    {              
-      //cout<<"AliFemtoESD  cut ch "<<endl;
-      //cout<<fCharge<<" Charge="<<track->Charge()<<endl;
-      if (track->Charge()!= fCharge)   
-       {
-         fNTracksFailed++;
-         //  cout<<"No Go Through the cut"<<endl;
-         // cout<<fCharge<<" Charge="<<track->Charge()<<endl;
-         return false;
-       }
-    }
-  float tEnergy = ::sqrt(track->P().Mag2()+fMass*fMass);
-  float tRapidity = 0.5*::log((tEnergy+track->P().z())/(tEnergy-track->P().z()));
-  float tPt = ::sqrt((track->P().x())*(track->P().x())+(track->P().y())*(track->P().y()));
-  if ((tRapidity<fRapidity[0])||(tRapidity>fRapidity[1]))
-    {
-      fNTracksFailed++;
-      //cout<<"No Go Through the cut"<<endl;   
-      //cout<<fRapidity[0]<<" < Rapidity ="<<tRapidity<<" <"<<fRapidity[1]<<endl;
-      return false;
-    }
-  if ((tPt<fPt[0])||(tPt>fPt[1]))
-    {
-      fNTracksFailed++;
-      //cout<<"No Go Through the cut"<<endl;
-      //cout<<fPt[0]<<" < Pt ="<<Pt<<" <"<<fPt[1]<<endl;
-      return false;
-    }
-
-    
-  if ((track->PidProbElectron()<fPidProbElectron[0])||(track->PidProbElectron()>fPidProbElectron[1]))
-    {
-      fNTracksFailed++;
-      //cout<<"No Go Through the cut"<<endl;
-      //cout<<fPidProbElectron[0]<<" < e ="<<track->PidProbElectron()<<" <"<<fPidProbElectron[1]<<endl;
-      return false;
-    }
-  if ((track->PidProbPion()<fPidProbPion[0])||(track->PidProbPion()>fPidProbPion[1]))
-    {
-      fNTracksFailed++;
-      //cout<<"No Go Through the cut"<<endl;
-      //cout<<fPidProbPion[0]<<" < pi ="<<track->PidProbPion()<<" <"<<fPidProbPion[1]<<endl;
-      return false;
-    }
-  if ((track->PidProbKaon()<fPidProbKaon[0])||(track->PidProbKaon()>fPidProbKaon[1]))
-    {
-      fNTracksFailed++;
-      //cout<<"No Go Through the cut"<<endl;
-      //cout<<fPidProbKaon[0]<<" < k ="<<track->PidProbKaon()<<" <"<<fPidProbKaon[1]<<endl;
-      return false;
-    }
-  if ((track->PidProbProton()<fPidProbProton[0])||(track->PidProbProton()>fPidProbProton[1]))
-    {
-      fNTracksFailed++;
-      //cout<<"No Go Through the cut"<<endl;
-      //cout<<fPidProbProton[0]<<" < p  ="<<track->PidProbProton()<<" <"<<fPidProbProton[1]<<endl;
-      return false;
-    }
-  if ((track->PidProbMuon()<fPidProbMuon[0])||(track->PidProbMuon()>fPidProbMuon[1]))
-    {
-      fNTracksFailed++;
-      //cout<<"No Go Through the cut"<<endl;
-      //cout<<fPidProbMuon[0]<<" <  mi="<<track->PidProbMuon()<<" <"<<fPidProbMuon[1]<<endl;
-      return false;
-    }
-
-  if (fMostProbable) {
-    tMost[0] = track->PidProbElectron()*PidFractionElectron(track->P().Mag());
-    tMost[1] = 0.0;
-    tMost[2] = track->PidProbPion()*PidFractionPion(track->P().Mag());
-    tMost[3] = track->PidProbKaon()*PidFractionKaon(track->P().Mag());
-    tMost[4] = track->PidProbProton()*PidFractionProton(track->P().Mag());
-    int imost=0;
-    float ipidmax = 0.0;
-    for (int ip=0; ip<5; ip++)
-      if (tMost[ip] > ipidmax) { ipidmax = tMost[ip]; imost = ip; };
-    if (imost != fMostProbable) return false;
-  }
-  
-  // cout<<"Go Through the cut"<<endl;
-  // cout<<fLabel<<" Label="<<track->Label()<<endl;
-  // cout<<fCharge<<" Charge="<<track->Charge()<<endl;
-  // cout<<fPt[0]<<" < Pt ="<<Pt<<" <"<<fPt[1]<<endl;
-  //cout<<fRapidity[0]<<" < Rapidity ="<<tRapidity<<" <"<<fRapidity[1]<<endl;
-  //cout<<fPidProbElectron[0]<<" <  e="<<track->PidProbElectron()<<" <"<<fPidProbElectron[1]<<endl;
-  //cout<<fPidProbPion[0]<<" <  pi="<<track->PidProbPion()<<" <"<<fPidProbPion[1]<<endl;
-  //cout<<fPidProbKaon[0]<<" <  k="<<track->PidProbKaon()<<" <"<<fPidProbKaon[1]<<endl;
-  //cout<<fPidProbProton[0]<<" <  p="<<track->PidProbProton()<<" <"<<fPidProbProton[1]<<endl;
-  //cout<<fPidProbMuon[0]<<" <  mi="<<track->PidProbMuon()<<" <"<<fPidProbMuon[1]<<endl;
-  fNTracksPassed++ ;
-  return true;
-    
-    
-}
-//------------------------------
-AliFemtoString AliFemtoAODTrackCut::Report()
-{
-  // Prepare report from the execution
-  string tStemp;
-  char tCtemp[100];
-  snprintf(tCtemp , 100, "Particle mass:\t%E\n",this->Mass());
-  tStemp=tCtemp;
-  snprintf(tCtemp , 100, "Particle charge:\t%d\n",fCharge);
-  tStemp+=tCtemp;
-  snprintf(tCtemp , 100, "Particle pT:\t%E - %E\n",fPt[0],fPt[1]);
-  tStemp+=tCtemp;
-  snprintf(tCtemp , 100, "Particle rapidity:\t%E - %E\n",fRapidity[0],fRapidity[1]);
-  tStemp+=tCtemp;
-  snprintf(tCtemp , 100, "Number of tracks which passed:\t%ld  Number which failed:\t%ld\n",fNTracksPassed,fNTracksFailed);
-  tStemp += tCtemp;
-  AliFemtoString returnThis = tStemp;
-  return returnThis;
-}
-TList *AliFemtoAODTrackCut::ListSettings()
-{
-  // return a list of settings in a writable form
-  TList *tListSetttings = new TList();
-  char buf[200];
-  snprintf(buf, 200, "AliFemtoAODTrackCut.mass=%f", this->Mass());
-  tListSetttings->AddLast(new TObjString(buf));
-
-  snprintf(buf, 200, "AliFemtoAODTrackCut.charge=%i", fCharge);
-  tListSetttings->AddLast(new TObjString(buf));
-  snprintf(buf, 200, "AliFemtoAODTrackCut.pidprobpion.minimum=%f", fPidProbPion[0]);
-  tListSetttings->AddLast(new TObjString(buf));
-  snprintf(buf, 200, "AliFemtoAODTrackCut.pidprobpion.maximum=%f", fPidProbPion[1]);
-  tListSetttings->AddLast(new TObjString(buf));
-  snprintf(buf, 200, "AliFemtoAODTrackCut.pidprobkaon.minimum=%f", fPidProbKaon[0]);
-  tListSetttings->AddLast(new TObjString(buf));
-  snprintf(buf, 200, "AliFemtoAODTrackCut.pidprobkaon.maximum=%f", fPidProbKaon[1]);
-  tListSetttings->AddLast(new TObjString(buf));
-  snprintf(buf, 200, "AliFemtoAODTrackCut.pidprobproton.minimum=%f", fPidProbProton[0]);
-  tListSetttings->AddLast(new TObjString(buf));
-  snprintf(buf, 200, "AliFemtoAODTrackCut.pidprobproton.maximum=%f", fPidProbProton[1]);
-  tListSetttings->AddLast(new TObjString(buf));
-  snprintf(buf, 200, "AliFemtoAODTrackCut.pidprobelectron.minimum=%f", fPidProbElectron[0]);
-  tListSetttings->AddLast(new TObjString(buf));
-  snprintf(buf, 200, "AliFemtoAODTrackCut.pidprobelectron.maximum=%f", fPidProbElectron[1]);
-  tListSetttings->AddLast(new TObjString(buf));
-  snprintf(buf, 200, "AliFemtoAODTrackCut.pidprobMuon.minimum=%f", fPidProbMuon[0]);
-  tListSetttings->AddLast(new TObjString(buf));
-  snprintf(buf, 200, "AliFemtoAODTrackCut.pidprobMuon.maximum=%f", fPidProbMuon[1]);
-  tListSetttings->AddLast(new TObjString(buf));
-  snprintf(buf, 200, "AliFemtoAODTrackCut.pt.minimum=%f", fPt[0]);
-  tListSetttings->AddLast(new TObjString(buf));
-  snprintf(buf, 200, "AliFemtoAODTrackCut.pt.maximum=%f", fPt[1]);
-  tListSetttings->AddLast(new TObjString(buf));
-  snprintf(buf, 200, "AliFemtoAODTrackCut.rapidity.minimum=%f", fRapidity[0]);
-  tListSetttings->AddLast(new TObjString(buf));
-  snprintf(buf, 200, "AliFemtoAODTrackCut.rapidity.maximum=%f", fRapidity[1]);
-  tListSetttings->AddLast(new TObjString(buf));
-  snprintf(buf, 200, "AliFemtoAODTrackCut.maxchindof=%f", fMaxchiNdof);
-  tListSetttings->AddLast(new TObjString(buf));
-  snprintf(buf, 200, "AliFemtoAODTrackCut.maxsigmatovertex=%f", fMaxSigmaToVertex);
-  tListSetttings->AddLast(new TObjString(buf));
-  if (fMostProbable) {
-    if (fMostProbable == 2)
-      snprintf(buf, 200, "AliFemtoAODTrackCut.mostprobable=%s", "Pion");
-    if (fMostProbable == 3)
-      snprintf(buf, 200, "AliFemtoAODTrackCut.mostprobable=%s", "Kaon");
-    if (fMostProbable == 4)
-      snprintf(buf, 200, "AliFemtoAODTrackCut.mostprobable=%s", "Proton");
-    tListSetttings->AddLast(new TObjString(buf));
-  }
-  return tListSetttings;
-}
-                           // electron
-// 0.13 - 1.8
-// 0       7.594129e-02    8.256141e-03
-// 1       -5.535827e-01   8.170825e-02
-// 2       1.728591e+00    3.104210e-01
-// 3       -2.827893e+00   5.827802e-01
-// 4       2.503553e+00    5.736207e-01
-// 5       -1.125965e+00   2.821170e-01
-// 6       2.009036e-01    5.438876e-02
-float AliFemtoAODTrackCut::PidFractionElectron(float mom) const
-{
-  // Provide a parameterized fraction of electrons dependent on momentum
-  if (mom<0.13) return 0.0;
-  if (mom>1.8) return 0.0;
-  return (7.594129e-02 
-         -5.535827e-01*mom        
-         +1.728591e+00*mom*mom    
-         -2.827893e+00*mom*mom*mom 
-         +2.503553e+00*mom*mom*mom*mom    
-         -1.125965e+00*mom*mom*mom*mom*mom      
-         +2.009036e-01*mom*mom*mom*mom*mom*mom);   
-}
-
-// pion
-// 0.13 - 2.0
-// 0       1.063457e+00    8.872043e-03
-// 1       -4.222208e-01   2.534402e-02
-// 2       1.042004e-01    1.503945e-02
-float AliFemtoAODTrackCut::PidFractionPion(float mom) const
-{
-  // Provide a parameterized fraction of pions dependent on momentum
-  if (mom<0.13) return 0.0;
-  if (mom>2.0) return 0.0;
-  return ( 1.063457e+00
-          -4.222208e-01*mom
-          +1.042004e-01*mom*mom);
-}
-
-// kaon
-// 0.18 - 2.0
-// 0       -7.289406e-02   1.686074e-03
-// 1       4.415666e-01    1.143939e-02
-// 2       -2.996790e-01   1.840964e-02
-// 3       6.704652e-02    7.783990e-03
-float AliFemtoAODTrackCut::PidFractionKaon(float mom) const
-{
-  // Provide a parameterized fraction of kaons dependent on momentum
-  if (mom<0.18) return 0.0;
-  if (mom>2.0) return 0.0;
-  return (-7.289406e-02
-         +4.415666e-01*mom        
-         -2.996790e-01*mom*mom    
-         +6.704652e-02*mom*mom*mom);
-}
-
-// proton
-// 0.26 - 2.0
-// 0       -3.730200e-02   2.347311e-03
-// 1       1.163684e-01    1.319316e-02
-// 2       8.354116e-02    1.997948e-02
-// 3       -4.608098e-02   8.336400e-03
-float AliFemtoAODTrackCut::PidFractionProton(float mom) const
-{
-  // Provide a parameterized fraction of protons dependent on momentum
-  if (mom<0.26) return  0.0;
-  if (mom>2.0) return 0.0;
-  return (-3.730200e-02  
-         +1.163684e-01*mom           
-         +8.354116e-02*mom*mom       
-         -4.608098e-02*mom*mom*mom);  
-}
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoAODTrackCut.h b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoAODTrackCut.h
deleted file mode 100644 (file)
index 4d7454c..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// AliFemtoAODTrackCut: A basic track cut that used information from     //
-// ALICE AOD to accept or reject the track.                              //  
-// Enables the selection on charge, transverse momentum, rapidity,       //
-// pid probabilities, number of ITS and TPC clusters                     //
-// Author: Adam Kisiel (WUT, OSU), Adam.Kisiel@cern.ch                   //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-#ifndef ALIFEMTOAODTRACKCUT_H
-#define ALIFEMTOAODTRACKCUT_H
-
-//#ifndef StMaker_H
-//#include "StMaker.h"
-//#endif
-
-#include "AliFemtoTrackCut.h"
-
-class AliFemtoAODTrackCut : public AliFemtoTrackCut 
-{
-
- public:
-  AliFemtoAODTrackCut();
-  virtual ~AliFemtoAODTrackCut();
-
-  virtual bool Pass(const AliFemtoTrack* aTrack);
-
-  virtual AliFemtoString Report();
-  virtual TList *ListSettings();
-  virtual AliFemtoParticleType Type(){return hbtTrack;}
-
-  void SetPt(const float& lo, const float& hi);
-  void SetRapidity(const float& lo, const float& hi);
-  void SetCharge(const int& ch);
-  void SetPidProbElectron(const float& lo, const float& hi);
-  void SetPidProbPion(const float& lo, const float& hi);
-  void SetPidProbKaon(const float& lo, const float& hi);
-  void SetPidProbProton(const float& lo, const float& hi);
-  void SetPidProbMuon(const float& lo, const float& hi);
-  void SetLabel(const bool& flag);
-  void SetMaxChiNdof(const float& maxchi);
-  void SetMaxSigmaToVertex(const float& maxsig);
-  void SetMostProbablePion();
-  void SetMostProbableKaon();
-  void SetMostProbableProton();
-  void SetNoMostProbable(); 
-
- private:   // here are the quantities I want to cut on...
-
-  int               fCharge;             // particle charge
-  float             fPt[2];              // bounds for transverse momentum
-  float             fRapidity[2];        // bounds for rapidity
-  float             fPidProbElectron[2]; // bounds for electron probability
-  float             fPidProbPion[2];     // bounds for pion probability
-  float             fPidProbKaon[2];     // bounds for kaon probability
-  float             fPidProbProton[2];   // bounds for proton probability
-  float             fPidProbMuon[2];     // bounds for muon probability 
-  bool              fLabel;              // if true label<0 will not pass throught 
-  float             fMaxchiNdof;         // maximum allowed chi2/ndof for TPC clusters
-  float             fMaxSigmaToVertex;   // maximum allowed sigma to primary vertex
-  long              fNTracksPassed;      // passed tracks count
-  long              fNTracksFailed;      // failed tracks count
-  int               fMostProbable;       // this particle type is required to be most probable
-
-  float PidFractionElectron(float mom) const;
-  float PidFractionPion(float mom) const;
-  float PidFractionKaon(float mom) const;
-  float PidFractionProton(float mom) const;
-
-#ifdef __ROOT__ 
-  ClassDef(AliFemtoAODTrackCut, 1)
-#endif
-    };
-
-
-inline void AliFemtoAODTrackCut::SetPt(const float& lo, const float& hi){fPt[0]=lo; fPt[1]=hi;}
-inline void AliFemtoAODTrackCut::SetRapidity(const float& lo,const float& hi){fRapidity[0]=lo; fRapidity[1]=hi;}
-inline void AliFemtoAODTrackCut::SetCharge(const int& ch){fCharge = ch;}
-inline void AliFemtoAODTrackCut::SetPidProbElectron(const float& lo,const float& hi){fPidProbElectron[0]=lo; fPidProbElectron[1]=hi;}
-inline void AliFemtoAODTrackCut::SetPidProbPion(const float& lo,const float& hi){fPidProbPion[0]=lo; fPidProbPion[1]=hi;}
-inline void AliFemtoAODTrackCut::SetPidProbKaon(const float& lo,const float& hi){fPidProbKaon[0]=lo; fPidProbKaon[1]=hi;}
-inline void AliFemtoAODTrackCut::SetPidProbProton(const float& lo,const float& hi){fPidProbProton[0]=lo; fPidProbProton[1]=hi;}
-inline void AliFemtoAODTrackCut::SetPidProbMuon(const float& lo,const float& hi){fPidProbMuon[0]=lo; fPidProbMuon[1]=hi;}
-inline void AliFemtoAODTrackCut::SetLabel(const bool& flag){fLabel=flag;}
-inline void AliFemtoAODTrackCut::SetMostProbablePion() { fMostProbable = 2; }
-inline void AliFemtoAODTrackCut::SetMostProbableKaon() { fMostProbable = 3; }
-inline void AliFemtoAODTrackCut::SetMostProbableProton() { fMostProbable = 4; }
-inline void AliFemtoAODTrackCut::SetNoMostProbable() { fMostProbable = 0; }
-inline void AliFemtoAODTrackCut::SetMaxChiNdof(const float& maxchi) { fMaxchiNdof = maxchi; }
-inline void AliFemtoAODTrackCut::SetMaxSigmaToVertex(const float& maxsig) { fMaxSigmaToVertex = maxsig; }
-
-#endif
-
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoAnalysis.h b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoAnalysis.h
deleted file mode 100644 (file)
index 8a98627..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-/// AliFemtoAnalysis - the pure virtual base class for femto analysis        ///
-/// All analysis classes must inherit from this one                          ///
-////////////////////////////////////////////////////////////////////////////////
-#ifndef AliFemtoAnalysis_hh
-#define AliFemtoAnalysis_hh
-
-#include "AliFemtoTypes.h"
-#include <TList.h>
-#include <TObjString.h>
-
-class AliFemtoEvent;
-
-class AliFemtoAnalysis{
-
-public:
-
-  AliFemtoAnalysis() { /* noop */ };
-  virtual ~AliFemtoAnalysis() { /* noop */ };
-
-  
-  virtual AliFemtoString Report() = 0;       //! returns reports of all cuts applied and correlation functions being done
-  virtual TList* ListSettings() = 0;         // return list of cut settings for the analysis
-
-  virtual TList* GetOutputList() = 0;        // Return a TList of objects to be written as output
-  virtual void ProcessEvent(const AliFemtoEvent* aEventToAnalyze) = 0;
-
-  virtual void Finish() = 0;
-
-};
-
-#endif
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoAnalysisAzimuthal.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoAnalysisAzimuthal.cxx
deleted file mode 100644 (file)
index 38cf4d2..0000000
+++ /dev/null
@@ -1,469 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-//                                                                        //
-// AliFemtoAnalysisReactionPlane - Femtoscopic analysis which mixes event //
-// with respect to the z position of the primary vertex and event total   //
-// multiplicity and uses only events in certain reaction plane angle bin  //
-//                                                                        //
-////////////////////////////////////////////////////////////////////////////
-
-#include "AliFemtoAnalysisAzimuthal.h"
-#include <TMath.h>
-#include <string>
-#include <cstdio>
-#include "AliFemtoParticleCollection.h"
-#include "AliFemtoTrackCut.h"
-#include "AliFemtoV0Cut.h"
-#include "AliFemtoPairCut.h"
-#include "TVector2.h"
-#include "AliFemtoKinkCut.h"
-#include "AliFemtoPicoEventCollectionVector.h"
-#include "AliFemtoPicoEventCollectionVectorHideAway.h"
-
-#ifdef __ROOT__ 
-ClassImp(AliFemtoAnalysisAzimuthal)
-#endif
-
-extern void FillHbtParticleCollection(AliFemtoParticleCut*         partCut,
-                                     AliFemtoEvent*               hbtEvent,
-                                     AliFemtoParticleCollection*  partCollection);
-
-
-//____________________________
-AliFemtoAnalysisAzimuthal::AliFemtoAnalysisAzimuthal(unsigned int binsVertex, double minVertex, double maxVertex,
-                                                      unsigned int binsMult, double minMult, double maxMult, unsigned short binsRP) 
-  : 
-  fFemtoParticleCut(0),
-  fFlowParticleCut(0),
-  fVertexZBins(binsVertex), 
-  fOverFlowVertexZ(0), 
-  fUnderFlowVertexZ(0),
-  fMultBins(binsMult) ,
-  fOverFlowMult(0),    
-  fUnderFlowMult(0),
-  fRPBins(binsRP),
-  fPsi(0)
-{
-  //  mControlSwitch     = 0;
-  fCorrFctnCollection= 0;
-  fCorrFctnCollection = new AliFemtoCorrFctnCollection;
-  fVertexZ[0] = minVertex;
-  fVertexZ[1] = maxVertex;
-  fMult[0] = minMult;
-  fMult[1] = maxMult;
-  if (fMixingBuffer) delete fMixingBuffer;
-  fPicoEventCollectionVectorHideAway = new AliFemtoPicoEventCollectionVectorHideAway(fVertexZBins,fVertexZ[0],fVertexZ[1],
-                                                                                    fMultBins,fMult[0],fMult[1],
-                                                                                    fRPBins,0.0,TMath::Pi());
-}
-
-//____________________________
-
-AliFemtoAnalysisAzimuthal::AliFemtoAnalysisAzimuthal(const AliFemtoAnalysisAzimuthal& a) : 
-  AliFemtoSimpleAnalysis(),
-  fFemtoParticleCut(0),
-  fFlowParticleCut(0),
-  fVertexZBins(a.fVertexZBins), 
-  fOverFlowVertexZ(0), 
-  fUnderFlowVertexZ(0),
-  fMultBins(a.fMultBins) ,
-  fOverFlowMult(0),    
-  fUnderFlowMult(0),
-  fRPBins(a.fRPBins),
-  fPsi(0)
-
-{
-  fCorrFctnCollection= 0;
-  fCorrFctnCollection = new AliFemtoCorrFctnCollection;
-  fVertexZ[0] = a.fVertexZ[0]; 
-  fVertexZ[1] = a.fVertexZ[1];
-  fMult[0] = a.fMult[0]; 
-  fMult[1] = a.fMult[1];
-  if (fMixingBuffer) delete fMixingBuffer;
-  fPicoEventCollectionVectorHideAway = new AliFemtoPicoEventCollectionVectorHideAway(fVertexZBins,fVertexZ[0],fVertexZ[1],
-                                                                                    fMultBins,fMult[0],fMult[1],
-                                                                                    fRPBins,0.0,TMath::Pi());
-  // find the right event cut
-  fEventCut = a.fEventCut->Clone();
-  // find the right femto particle cut
-  fFemtoParticleCut = a.fFemtoParticleCut->Clone();
-  // find the right flow particle cut
-  fFlowParticleCut = a.fFlowParticleCut->Clone();
-  // find the right pair cut
-  fPairCut = a.fPairCut->Clone();
-  
-  if ( fEventCut ) {
-      SetEventCut(fEventCut); // this will set the myAnalysis pointer inside the cut
-      cout << " AliFemtoAnalysisAzimuthal::AliFemtoAnalysisAzimuthal(const AliFemtoAnalysisAzimuthal& a) - event cut set " << endl;
-  }
-  if ( fFemtoParticleCut ) {
-      SetFirstParticleCut(fFemtoParticleCut); // this will set the myAnalysis pointer inside the cut
-      cout << " AliFemtoAnalysisAzimuthal::AliFemtoAnalysisAzimuthal(const AliFemtoAnalysisAzimuthal& a) - femto particle cut set " << endl;
-  }
-  if ( fFlowParticleCut ) {
-      SetSecondParticleCut(fFlowParticleCut); // this will set the myAnalysis pointer inside the cut
-      cout << " AliFemtoAnalysisAzimuthal::AliFemtoAnalysisAzimuthal(const AliFemtoAnalysisAzimuthal& a) - flow particle cut set " << endl;
-  }
-  if ( fPairCut ) {
-      SetPairCut(fPairCut); // this will set the myAnalysis pointer inside the cut
-      cout << " AliFemtoAnalysisAzimuthal::AliFemtoAnalysisAzimuthal(const AliFemtoAnalysisAzimuthal& a) - pair cut set " << endl;
-  }
-
-  AliFemtoCorrFctnIterator iter;
-  for (iter=a.fCorrFctnCollection->begin(); iter!=a.fCorrFctnCollection->end();iter++){
-    cout << " AliFemtoAnalysisAzimuthal::AliFemtoAnalysisAzimuthal(const AliFemtoAnalysisAzimuthal& a) - looking for correlation functions " << endl;
-    AliFemtoCorrFctn* fctn = (*iter)->Clone();
-    if (fctn) AddCorrFctn(fctn);
-    else cout << " AliFemtoAnalysisAzimuthal::AliFemtoAnalysisAzimuthal(const AliFemtoAnalysisAzimuthal& a) - correlation function not found " << endl;
-  }
-  fNumEventsToMix = a.fNumEventsToMix;
-  cout << " AliFemtoAnalysisAzimuthal::AliFemtoAnalysisAzimuthal(const AliFemtoAnalysisAzimuthal& a) - analysis copied " << endl;
-}
-
-AliFemtoAnalysisAzimuthal& AliFemtoAnalysisAzimuthal::operator=(const AliFemtoAnalysisAzimuthal& a)
-{
-  // Assignment operator
-  if (this == &a)
-    return *this;
-
-  fCorrFctnCollection= 0;
-  fCorrFctnCollection = new AliFemtoCorrFctnCollection;
-  fVertexZ[0] = a.fVertexZ[0]; 
-  fVertexZ[1] = a.fVertexZ[1];
-  fMult[0] = a.fMult[0]; 
-  fMult[1] = a.fMult[1];
-  if (fMixingBuffer) delete fMixingBuffer;
-  fPicoEventCollectionVectorHideAway = new AliFemtoPicoEventCollectionVectorHideAway(fVertexZBins,fVertexZ[0],fVertexZ[1],
-                                                                                    fMultBins,fMult[0],fMult[1],
-                                                                                    fRPBins,0.0,TMath::Pi());
-  // find the right event cut
-  fEventCut = a.fEventCut->Clone();
-  // find the right femto particle cut
-  fFemtoParticleCut = a.fFemtoParticleCut->Clone();
-  // find the right flow particle cut
-  fFlowParticleCut = a.fFlowParticleCut->Clone();
-  // find the right pair cut
-  fPairCut = a.fPairCut->Clone();
-  
-  if ( fEventCut ) {
-      SetEventCut(fEventCut); // this will set the myAnalysis pointer inside the cut
-      cout << " AliFemtoAnalysisAzimuthal::AliFemtoAnalysisAzimuthal(const AliFemtoAnalysisAzimuthal& a) - event cut set " << endl;
-  }
-  if ( fFemtoParticleCut ) {
-      SetFirstParticleCut(fFemtoParticleCut); // this will set the myAnalysis pointer inside the cut
-      cout << " AliFemtoAnalysisAzimuthal::AliFemtoAnalysisAzimuthal(const AliFemtoAnalysisAzimuthal& a) - femto particle cut set " << endl;
-  }
-  if ( fFlowParticleCut ) {
-      SetSecondParticleCut(fFlowParticleCut); // this will set the myAnalysis pointer inside the cut
-      cout << " AliFemtoAnalysisAzimuthal::AliFemtoAnalysisAzimuthal(const AliFemtoAnalysisAzimuthal& a) - flow particle cut set " << endl;
-  }
-  if ( fPairCut ) {
-      SetPairCut(fPairCut); // this will set the myAnalysis pointer inside the cut
-      cout << " AliFemtoAnalysisAzimuthal::AliFemtoAnalysisAzimuthal(const AliFemtoAnalysisAzimuthal& a) - pair cut set " << endl;
-  }
-
-  AliFemtoCorrFctnIterator iter;
-  for (iter=a.fCorrFctnCollection->begin(); iter!=a.fCorrFctnCollection->end();iter++){
-    cout << " AliFemtoAnalysisAzimuthal::AliFemtoAnalysisAzimuthal(const AliFemtoAnalysisAzimuthal& a) - looking for correlation functions " << endl;
-    AliFemtoCorrFctn* fctn = (*iter)->Clone();
-    if (fctn) AddCorrFctn(fctn);
-    else cout << " AliFemtoAnalysisAzimuthal::AliFemtoAnalysisAzimuthal(const AliFemtoAnalysisAzimuthal& a) - correlation function not found " << endl;
-  }
-  fNumEventsToMix = a.fNumEventsToMix;
-  cout << " AliFemtoAnalysisAzimuthal::AliFemtoAnalysisAzimuthal(const AliFemtoAnalysisAzimuthal& a) - analysis copied " << endl;
-
-  return *this;
-  
-}
-
-//____________________________
-AliFemtoAnalysisAzimuthal::~AliFemtoAnalysisAzimuthal(){
-  // now delete every PicoEvent in the EventMixingBuffer and then the Buffer itself
-  delete fPicoEventCollectionVectorHideAway;
-}
-
-//_________________________
-void AliFemtoAnalysisAzimuthal::ProcessEvent(const AliFemtoEvent* hbtEvent) {
-  // Perform event processing in bins of z vertex, multiplicity and Reaction Plane angle
-  // cout << " AliFemtoAnalysisAzimuthal::ProcessEvent(const AliFemtoEvent* hbtEvent) " << endl;
-
-  //****from AliFemtoSimpleAnalysis****
-
-  fPicoEvent=0; // we will get a new pico event, if not prevent corr. fctn to access old pico event
-  fNeventsProcessed++;
-
-  // startup for EbyE 
-  fFemtoParticleCut->EventBegin(hbtEvent);
-  fFlowParticleCut->EventBegin(hbtEvent);
-  fPairCut->EventBegin(hbtEvent);
-
-  for (AliFemtoCorrFctnIterator iter=fCorrFctnCollection->begin(); iter!=fCorrFctnCollection->end();iter++){
-    (*iter)->EventBegin(hbtEvent);
-  }
-
-  // event cut and event cut monitor
-  bool tmpPassEvent = fEventCut->Pass(hbtEvent);
-  if (!tmpPassEvent) 
-    fEventCut->FillCutMonitor(hbtEvent, tmpPassEvent);
-  if (tmpPassEvent) {
-    fPicoEvent = new AliFemtoPicoEvent; // this is what we will make pairs from and put in Mixing Buffer, no memory leak. we will delete picoevents when they come out of the mixing buffer
-    FillHbtParticleCollection(fFemtoParticleCut,(AliFemtoEvent*)hbtEvent,fPicoEvent->FirstParticleCollection());
-    FillHbtParticleCollection(fFlowParticleCut,(AliFemtoEvent*)hbtEvent,fPicoEvent->SecondParticleCollection());
-    
-      // get right mixing buffer
-  double vertexZ = hbtEvent->PrimVertPos().z();
-  double mult = hbtEvent->UncorrectedNumberOfPrimaries();
-  TVector2 tQ = GetQVector(fPicoEvent->SecondParticleCollection());
-  double tPsi=tQ.Phi()/2.;
-  if (tPsi > TMath::Pi()) tPsi -= TMath::Pi();
-      
-   fMixingBuffer = fPicoEventCollectionVectorHideAway->PicoEventCollection(vertexZ,mult,fPsi); 
-  if (!fMixingBuffer) {
-    if ( vertexZ < fVertexZ[0] ) fUnderFlowVertexZ++;
-    if ( vertexZ > fVertexZ[1] ) fOverFlowVertexZ++;
-    if ( mult < fMult[0] ) fUnderFlowMult++;
-    if ( mult > fMult[1] ) fOverFlowMult++;
-    return;
-  }   
-    
-    //cout << "#particles in Collection: " << fPicoEvent->FirstParticleCollection()->size() << endl;
-    
-    //switch which allows only using events with ParticleCollections containing a minimum number of entries
-    if (fPicoEvent->FirstParticleCollection()->size() >= fMinSizePartCollection ) {
-      fEventCut->FillCutMonitor(hbtEvent, tmpPassEvent);
-    }
-
-      //------ Make real pairs (assume identical) ------//
-      MakePairs("real", fPicoEvent->FirstParticleCollection() );
-      //cout << "AliFemtoAnalysisAzimuthal::ProcessEvent() - reals done ";
-
-      //---- Make pairs for mixed events, looping over events in mixingBuffer ----//
-      AliFemtoPicoEvent* storedEvent;
-      AliFemtoPicoEventIterator fPicoEventIter;
-      for (fPicoEventIter=MixingBuffer()->begin();fPicoEventIter!=MixingBuffer()->end();fPicoEventIter++){
-        storedEvent = *fPicoEventIter;
-        MakePairs("mixed",fPicoEvent->FirstParticleCollection(),
-                            storedEvent->FirstParticleCollection() );
-      }
-      //cout << " - mixed done   " << endl;
-
-      //--------- If mixing buffer is full, delete oldest event ---------//
-      if ( MixingBufferFull() ) {
-        delete MixingBuffer()->back();
-        MixingBuffer()->pop_back();
-      }
-
-      //-------- Add current event (fPicoEvent) to mixing buffer --------//
-      MixingBuffer()->push_front(fPicoEvent);
-
-    }  // if ParticleCollections are big enough (mal jun2002)
-    else{
-      fEventCut->FillCutMonitor(hbtEvent, !tmpPassEvent);
-      delete fPicoEvent;
-    }
-
-  // if currentEvent is accepted by currentAnalysis cleanup for EbyE 
-  fFemtoParticleCut->EventEnd(hbtEvent);
-  fFlowParticleCut->EventEnd(hbtEvent);
-  fPairCut->EventEnd(hbtEvent);
-  for (AliFemtoCorrFctnIterator iter=fCorrFctnCollection->begin(); iter!=fCorrFctnCollection->end();iter++){
-    (*iter)->EventEnd(hbtEvent);
-  } 
-}
-
-//_______________________________________________________________________________
-void AliFemtoAnalysisAzimuthal::MakePairs(const char* typeIn, AliFemtoParticleCollection *partCollection1,
-                                      AliFemtoParticleCollection *partCollection2){
-// Build pairs, check pair cuts, and call CFs' AddRealPair() or AddMixedPair() methods. 
-// If no second particle collection is specfied, make pairs within first particle collection.
-
-  string type = typeIn;
-
-  //  int swpart = ((long int) partCollection1) % 2;
-  int swpart = fNeventsProcessed % 2;
-
-  AliFemtoPair* tPair = new AliFemtoPair;
-  AliFemtoCorrFctnIterator tCorrFctnIter;
-  AliFemtoParticleIterator tPartIter1, tPartIter2;
-
-  AliFemtoParticleIterator tStartOuterLoop = partCollection1->begin();  // always
-  AliFemtoParticleIterator tEndOuterLoop   = partCollection1->end();    // will be one less if identical
-  AliFemtoParticleIterator tStartInnerLoop;
-  AliFemtoParticleIterator tEndInnerLoop;
-  if (partCollection2) {                         //   Two collections:
-    tStartInnerLoop = partCollection2->begin();  //   Full inner & outer loops
-    tEndInnerLoop   = partCollection2->end();    
-  }
-  else {                                         //   One collection:
-    tEndOuterLoop--;                             //   Outer loop goes to next-to-last particle
-    tEndInnerLoop = partCollection1->end() ;     //   Inner loop goes to last particle
-  }
-  for (tPartIter1=tStartOuterLoop;tPartIter1!=tEndOuterLoop;tPartIter1++) {
-    if (!partCollection2){
-      tStartInnerLoop = tPartIter1;
-      tStartInnerLoop++;
-    }
-    tPair->SetTrack1(*tPartIter1);
-    for (tPartIter2 = tStartInnerLoop; tPartIter2!=tEndInnerLoop;tPartIter2++) {
-      tPair->SetTrack2(*tPartIter2);
-
-//For getting the pair angle wrt EP
-  if (type == "real"){
-       TVector2 tQ, tQVector;
-       float tPsi=0, mQx=0, mQy=0, PairAngleEP=0;
-       tQ = GetQVector(partCollection1);
-
-       mQx = tQ.X() - cos(2*(tPair->Track1()->FourMomentum().Phi()))*(tPair->Track1()->Track()->Pt()) - cos(2*(tPair->Track2()->FourMomentum().Phi()))*(tPair->Track2()->Track()->Pt());
-       mQy = tQ.Y() - sin(2*(tPair->Track1()->FourMomentum().Phi()))*(tPair->Track1()->Track()->Pt()) - sin(2*(tPair->Track2()->FourMomentum().Phi()))*(tPair->Track2()->Track()->Pt());
-  
-       tQVector.Set(mQx,mQy);
-
-       tPsi=tQVector.Phi()/2.;
-       if (tPsi > TMath::Pi()) tPsi -= TMath::Pi();
-
-       PairAngleEP = (tPair->EmissionAngle() - tPsi);
-       tPair->SetPairAngleEP(PairAngleEP);
-  }
-
-  if (type == "mixed"){
-       float tPsi1=0, tPsi2=0, mQx1=0, mQx2=0,mQy1=0, mQy2=0, px1=0, px2=0, py1=0, py2=0, PairAngleEP=0;
-       TVector2 tQ1, tQ2, tQVector1, tQVector2, tP;
-
-       tQ1 = GetQVector(partCollection1);
-       tQ2 = GetQVector(partCollection2);
-
-       mQx1 = tQ1.X() - cos(2*(tPair->Track1()->FourMomentum().Phi()))*(tPair->Track1()->Track()->Pt());
-       mQx2 = tQ2.X() - cos(2*(tPair->Track2()->FourMomentum().Phi()))*(tPair->Track2()->Track()->Pt());
-       mQy1 = tQ1.Y() - sin(2*(tPair->Track1()->FourMomentum().Phi()))*(tPair->Track1()->Track()->Pt());
-       mQy2 = tQ2.Y() - sin(2*(tPair->Track2()->FourMomentum().Phi()))*(tPair->Track2()->Track()->Pt());
-  
-       tQVector1.Set(mQx1,mQy1);
-       tQVector2.Set(mQx2,mQy2);
-
-       tPsi1=tQVector1.Phi()/2.;
-       if (tPsi1 > TMath::Pi()) tPsi1 -= TMath::Pi();
-
-       tPsi2=tQVector2.Phi()/2.;
-       if (tPsi2 > TMath::Pi()) tPsi2 -= TMath::Pi();
-
-       px1 = (tPair->Track1()->Track()->Pt())*cos(tPair->Track1()->FourMomentum().Phi() - tPsi1);
-       px2 = (tPair->Track2()->Track()->Pt())*cos(tPair->Track2()->FourMomentum().Phi() - tPsi2);
-       py1 = (tPair->Track1()->Track()->Pt())*sin(tPair->Track1()->FourMomentum().Phi() - tPsi1);
-       py2 = (tPair->Track2()->Track()->Pt())*sin(tPair->Track2()->FourMomentum().Phi() - tPsi2);
-
-       tP.Set(px1+px2, py1+py2);
-       PairAngleEP = tP.Phi();
-
-       tPair->SetPairAngleEP(PairAngleEP);
-  }
-
-      // The following lines have to be uncommented if you want pairCutMonitors
-      // they are not in for speed reasons
-      // bool tmpPassPair = fPairCut->Pass(tPair);
-      // fPairCut->FillCutMonitor(tPair, tmpPassPair);
-      // if ( tmpPassPair )
-
-      //---- If pair passes cut, loop over CF's and add pair to real/mixed ----//
-
-      if (!partCollection2) {
-       if (swpart) {
-         tPair->SetTrack1(*tPartIter2);
-         tPair->SetTrack2(*tPartIter1);
-         swpart = 0;
-       }
-       else {
-         tPair->SetTrack1(*tPartIter1);
-         tPair->SetTrack2(*tPartIter2);
-         swpart = 1;
-       }
-      }
-
-
-      if (fPairCut->Pass(tPair)){
-        for (tCorrFctnIter=fCorrFctnCollection->begin();
-             tCorrFctnIter!=fCorrFctnCollection->end();tCorrFctnIter++){
-          AliFemtoCorrFctn* tCorrFctn = *tCorrFctnIter;
-          if(type == "real")
-            tCorrFctn->AddRealPair(tPair);
-         else if(type == "mixed")
-            tCorrFctn->AddMixedPair(tPair);
-          else
-            cout << "Problem with pair type, type = " << type.c_str() << endl;
-        }
-      }
-    }    // loop over second particle
-  }      // loop over first particle
-
-  delete tPair;
-}
-
-//_____________________________________________
-TVector2 AliFemtoAnalysisAzimuthal::GetQVector(AliFemtoParticleCollection* particlecollection){
-  
-  TVector2 mQ;
-  float mQx=0, mQy=0;
-
-  if (!particlecollection) {
-    mQ.Set(0.0, 0.0);
-    return mQ;
-  }
-
-  AliFemtoParticle* flowparticle;
-  AliFemtoParticleIterator pIter;
-  AliFemtoParticleIterator startLoop = particlecollection->begin();
-  AliFemtoParticleIterator endLoop   = particlecollection->end();
-  for (pIter=startLoop;pIter!=endLoop;pIter++){
-    flowparticle = *pIter;
-    mQx += (cos(2*flowparticle->FourMomentum().Phi()))*(flowparticle->Track()->Pt());
-    mQy += (sin(2*flowparticle->FourMomentum().Phi()))*(flowparticle->Track()->Pt());
-  }
-  
-  mQ.Set(mQx,mQy);
-  return mQ;
-}
-
-//__________________________________________________
-double AliFemtoAnalysisAzimuthal::GetCurrentReactionPlane()
-{
-  return fPsi;
-}
-
-//_________________________
-TList* AliFemtoAnalysisAzimuthal::GetOutputList()
-{
-  // Collect the list of output objects to be written
-
-  TList *tOutputList = new TList();
-  TList *p1Cut = fFemtoParticleCut->GetOutputList();
-
-  TListIter nextp1(p1Cut);
-  while (TObject *obj = nextp1.Next()) {
-    tOutputList->Add(obj);
-  }
-
-  TList *pairCut = fPairCut->GetOutputList();
-
-  TIter nextpair(pairCut);
-  while (TObject *obj = nextpair()) {
-    tOutputList->Add(obj);
-  }
-
-  TList *eventCut = fEventCut->GetOutputList();
-
-  TIter nextevent(eventCut);
-  while (TObject *obj = nextevent()) {
-    tOutputList->Add(obj);
-  }
-
-  AliFemtoCorrFctnIterator iter;
-  for (iter=fCorrFctnCollection->begin(); iter!=fCorrFctnCollection->end();iter++){
-    TList *tListCf = (*iter)->GetOutputList();
-    
-    TIter nextListCf(tListCf);
-    while (TObject *obj = nextListCf()) {
-      tOutputList->Add(obj);
-    }
-  }
-
-  return tOutputList;
-  
-}
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoAnalysisAzimuthal.h b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoAnalysisAzimuthal.h
deleted file mode 100644 (file)
index d806651..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-//                                                                        //
-// AliFemtoAnalysisReactionPlane - Femtoscopic analysis which mixes event //
-// with respect to the z position of the primary vertex and event total   //
-// multiplicity and uses only events in certain reaction plane angle bin  //
-//                                                                        //
-////////////////////////////////////////////////////////////////////////////
-
-#ifndef ALIFEMTOANALYSISAZIMUTHAL_H
-#define ALIFEMTOANALYSISAZIMUTHAL_H
-
-#include "AliFemtoSimpleAnalysis.h"        // base analysis class
-
-class TVector2;
-
-class AliFemtoAnalysisAzimuthal : public AliFemtoSimpleAnalysis {
-
-public:
-
-  AliFemtoAnalysisAzimuthal(unsigned int binsVertex=10, double minVertex=-100., double maxVertex=+100., unsigned int binsMult=10, double minMult=-1.e9, double maxMult=+1.e9, unsigned short binsRP=10);
-  AliFemtoAnalysisAzimuthal(const AliFemtoAnalysisAzimuthal& TheOriginalAnalysis);  // copy constructor
-
-  AliFemtoAnalysisAzimuthal& operator=(const AliFemtoAnalysisAzimuthal& aAna);
-
-  virtual void ProcessEvent(const AliFemtoEvent* ProcessThisEvent);
-  virtual ~AliFemtoAnalysisAzimuthal();
-  virtual unsigned int OverflowVertexZ() const { return fOverFlowVertexZ;}
-  virtual unsigned int UnderflowVertexZ() const { return fUnderFlowVertexZ;}
-  virtual unsigned int OverflowMult() const { return fOverFlowMult;}
-  virtual unsigned int UnderflowMult() const { return fUnderFlowMult;}
-  double GetCurrentReactionPlane();
-  TVector2 GetQVector(AliFemtoParticleCollection* particlecollection);
-  virtual void MakePairs(const char* typeIn, AliFemtoParticleCollection *partCollection1, AliFemtoParticleCollection *partCollection2=0);
-  virtual TList* GetOutputList();
-
- // Get the particle cuts
-  virtual AliFemtoParticleCut*   FemtoParticleCut() {return fFemtoParticleCut;}
-  virtual AliFemtoParticleCut*   FlowParticleCut() {return fFlowParticleCut;}
- // Set the cuts
-  void SetFemtoParticleCut(AliFemtoParticleCut* x) {fFemtoParticleCut = x; x->SetAnalysis((AliFemtoAnalysis*)this);}
-  void SetFlowParticleCut(AliFemtoParticleCut* x) {fFlowParticleCut = x; x->SetAnalysis((AliFemtoAnalysis*)this);}
-  void SetEventCut(AliFemtoEventCut* x) {fEventCut = x; x->SetAnalysis((AliFemtoAnalysis*)this);}
-  void SetPairCut(AliFemtoPairCut* x) {fPairCut = x; x->SetAnalysis((AliFemtoAnalysis*)this);}
-
-protected:
-
-  AliFemtoParticleCut*                 fFemtoParticleCut;    //  select particles of type #1 
-  AliFemtoParticleCut*         fFlowParticleCut;   //  select particles of type #2 
-
-  double fVertexZ[2];                 /* min/max z-vertex position allowed to be processed */
-  unsigned int fVertexZBins;          /* number of VERTEX mixing bins in z-vertex in EventMixing Buffer */
-  unsigned int fOverFlowVertexZ;      /* number of events encountered which had too large z-vertex */
-  unsigned int fUnderFlowVertexZ;     /* number of events encountered which had too small z-vertex */
-  double fMult[2];                    /* min/max multiplicity allowed for event to be processed */
-  unsigned int fMultBins;             /* number of MULTIPLICITY mixing bins in z-vertex in EventMixing Buffer */
-  unsigned int fOverFlowMult;         /* number of events encountered which had too large multiplicity */
-  unsigned int fUnderFlowMult;        /* number of events encountered which had too small multiplicity */
-  unsigned short fRPBins;             // Number of reaction plane angle orientation bins
-  double fPsi;                         // Reaction plane angle of the current event
-
-#ifdef __ROOT__
-  ClassDef(AliFemtoAnalysisAzimuthal, 0)
-#endif
-    
-};
-
-#endif
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoAnalysisCollection.h b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoAnalysisCollection.h
deleted file mode 100644 (file)
index 2ef52b4..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/***************************************************************************
- *
- * $Id$
- *
- * Author: Mike Lisa, Ohio State, lisa@mps.ohio-state.edu
- ***************************************************************************
- *
- * Description: part of STAR HBT Framework: AliFemtoMaker package
- *  The AnalysisCollection is pointed to by the Manager, and holds pointers
- *  to all Analysis objects currently active
- *
- ***************************************************************************
- *
- * $Log$
- * Revision 1.1  2007/05/16 10:22:11  akisiel
- * Making the directory structure of AliFemto flat. All files go into one common directory
- *
- * Revision 1.1.1.1  2007/04/25 15:38:41  panos
- * Importing the HBT code dir
- *
- * Revision 1.1.1.1  2007/03/07 10:14:49  mchojnacki
- * First version on CVS
- *
- * Revision 1.3  2000/03/17 17:23:05  laue
- * Roberts new three particle correlations implemented.
- *
- * Revision 1.2  2000/02/01 00:33:31  laue
- * namespaces changed to run on the new Solaris Compiler CC5
- * since we can use member templates in franks1Histo.h we are doing it
- *
- * Revision 1.1.1.1  1999/06/29 16:02:57  lisa
- * Installation of AliFemtoMaker
- *
- **************************************************************************/
-
-#ifndef AliFemtoAnalysisCollection_hh
-#define AliFemtoAnalysisCollection_hh
-
-
-#include <list>
-#if !defined(ST_NO_NAMESPACES)
-using std::list;
-#endif
-class AliFemtoAnalysis;
-
-#ifdef ST_NO_TEMPLATE_DEF_ARGS
-typedef list<AliFemtoAnalysis*, allocator<AliFemtoAnalysis*> >            AliFemtoAnalysisCollection;
-typedef list<AliFemtoAnalysis*, allocator<AliFemtoAnalysis*> >::iterator  AliFemtoSimpleAnalysisIterator;
-#else
-typedef list<AliFemtoAnalysis*>            AliFemtoAnalysisCollection;
-typedef list<AliFemtoAnalysis*>::iterator  AliFemtoSimpleAnalysisIterator;
-#endif
-
-#endif
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoAnalysisReactionPlane.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoAnalysisReactionPlane.cxx
deleted file mode 100644 (file)
index 11fbdbd..0000000
+++ /dev/null
@@ -1,255 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-//                                                                        //
-// AliFemtoAnalysisReactionPlane - Femtoscopic analysis which mixes event //
-// with respect to the z position of the primary vertex and event total   //
-// multiplicity and uses only events in certain reaction plane angle bin  //
-//                                                                        //
-////////////////////////////////////////////////////////////////////////////
-
-#include <TMath.h>
-#include "AliFemtoAnalysisReactionPlane.h"
-#include "AliFemtoParticleCollection.h"
-#include "AliFemtoTrackCut.h"
-#include "AliFemtoV0Cut.h"
-#include "AliFemtoKinkCut.h"
-#include "AliFemtoPicoEventCollectionVector.h"
-#include "AliFemtoPicoEventCollectionVectorHideAway.h"
-
-#ifdef __ROOT__ 
-ClassImp(AliFemtoAnalysisReactionPlane)
-#endif
-
-extern void FillHbtParticleCollection(AliFemtoParticleCut*         partCut,
-                                     AliFemtoEvent*               hbtEvent,
-                                     AliFemtoParticleCollection*  partCollection);
-
-
-//____________________________
-AliFemtoAnalysisReactionPlane::AliFemtoAnalysisReactionPlane(unsigned int binsVertex, double minVertex, double maxVertex,
-                                                      unsigned int binsMult, double minMult, double maxMult, unsigned short binsRP) 
-  : 
-  fVertexZBins(binsVertex), 
-  fOverFlowVertexZ(0), 
-  fUnderFlowVertexZ(0),
-  fMultBins(binsMult) ,
-  fOverFlowMult(0),    
-  fUnderFlowMult(0),
-  fRPBins(binsRP),
-  fCurrentRP(0)
-{
-  //  mControlSwitch     = 0;
-  fEventCut          = 0;
-  fFirstParticleCut  = 0;
-  fSecondParticleCut = 0;
-  fPairCut           = 0;
-  fCorrFctnCollection= 0;
-  fCorrFctnCollection = new AliFemtoCorrFctnCollection;
-  fVertexZ[0] = minVertex;
-  fVertexZ[1] = maxVertex;
-  fUnderFlowVertexZ = 0; 
-  fOverFlowVertexZ = 0; 
-  fMult[0] = minMult;
-  fMult[1] = maxMult;
-  fUnderFlowMult = 0; 
-  fOverFlowMult = 0; 
-  if (fMixingBuffer) delete fMixingBuffer;
-  fPicoEventCollectionVectorHideAway = new AliFemtoPicoEventCollectionVectorHideAway(fVertexZBins,fVertexZ[0],fVertexZ[1],
-                                                                                    fMultBins,fMult[0],fMult[1],
-                                                                                    fRPBins,0.0,TMath::Pi());
-}
-//____________________________
-
-AliFemtoAnalysisReactionPlane::AliFemtoAnalysisReactionPlane(const AliFemtoAnalysisReactionPlane& a) : 
-  AliFemtoSimpleAnalysis(),
-  fVertexZBins(a.fVertexZBins), 
-  fOverFlowVertexZ(0), 
-  fUnderFlowVertexZ(0),
-  fMultBins(a.fMultBins) ,
-  fOverFlowMult(0),    
-  fUnderFlowMult(0),
-  fRPBins(a.fRPBins),
-  fCurrentRP(0)
-{
-  //AliFemtoAnalysisReactionPlane();
-  fEventCut          = 0;
-  fFirstParticleCut  = 0;
-  fSecondParticleCut = 0;
-  fPairCut           = 0;
-  fCorrFctnCollection= 0;
-  fCorrFctnCollection = new AliFemtoCorrFctnCollection;
-  fVertexZ[0] = a.fVertexZ[0]; 
-  fVertexZ[1] = a.fVertexZ[1];
-  fUnderFlowVertexZ = 0; 
-  fOverFlowVertexZ = 0; 
-  fMult[0] = a.fMult[0]; 
-  fMult[1] = a.fMult[1];
-  fUnderFlowMult = 0; 
-  fOverFlowMult = 0; 
-  if (fMixingBuffer) delete fMixingBuffer;
-  fPicoEventCollectionVectorHideAway = new AliFemtoPicoEventCollectionVectorHideAway(fVertexZBins,fVertexZ[0],fVertexZ[1],
-                                                                                    fMultBins,fMult[0],fMult[1],
-                                                                                    fRPBins,0.0,TMath::Pi());
-
-  // find the right event cut
-  fEventCut = a.fEventCut->Clone();
-  // find the right first particle cut
-  fFirstParticleCut = a.fFirstParticleCut->Clone();
-  // find the right second particle cut
-  if (a.fFirstParticleCut==a.fSecondParticleCut) 
-    SetSecondParticleCut(fFirstParticleCut); // identical particle hbt
-  else
-  fSecondParticleCut = a.fSecondParticleCut->Clone();
-
-  fPairCut = a.fPairCut->Clone();
-  
-  if ( fEventCut ) {
-      SetEventCut(fEventCut); // this will set the myAnalysis pointer inside the cut
-      cout << " AliFemtoAnalysisReactionPlane::AliFemtoAnalysisReactionPlane(const AliFemtoAnalysisReactionPlane& a) - event cut set " << endl;
-  }
-  if ( fFirstParticleCut ) {
-      SetFirstParticleCut(fFirstParticleCut); // this will set the myAnalysis pointer inside the cut
-      cout << " AliFemtoAnalysisReactionPlane::AliFemtoAnalysisReactionPlane(const AliFemtoAnalysisReactionPlane& a) - first particle cut set " << endl;
-  }
-  if ( fSecondParticleCut ) {
-      SetSecondParticleCut(fSecondParticleCut); // this will set the myAnalysis pointer inside the cut
-      cout << " AliFemtoAnalysisReactionPlane::AliFemtoAnalysisReactionPlane(const AliFemtoAnalysisReactionPlane& a) - second particle cut set " << endl;
-  }  if ( fPairCut ) {
-      SetPairCut(fPairCut); // this will set the myAnalysis pointer inside the cut
-      cout << " AliFemtoAnalysisReactionPlane::AliFemtoAnalysisReactionPlane(const AliFemtoAnalysisReactionPlane& a) - pair cut set " << endl;
-  }
-
-  AliFemtoCorrFctnIterator iter;
-  for (iter=a.fCorrFctnCollection->begin(); iter!=a.fCorrFctnCollection->end();iter++){
-    cout << " AliFemtoAnalysisReactionPlane::AliFemtoAnalysisReactionPlane(const AliFemtoAnalysisReactionPlane& a) - looking for correlation functions " << endl;
-    AliFemtoCorrFctn* fctn = (*iter)->Clone();
-    if (fctn) AddCorrFctn(fctn);
-    else cout << " AliFemtoAnalysisReactionPlane::AliFemtoAnalysisReactionPlane(const AliFemtoAnalysisReactionPlane& a) - correlation function not found " << endl;
-  }
-
-  fNumEventsToMix = a.fNumEventsToMix;
-
-  cout << " AliFemtoAnalysisReactionPlane::AliFemtoAnalysisReactionPlane(const AliFemtoAnalysisReactionPlane& a) - analysis copied " << endl;
-
-}
-AliFemtoAnalysisReactionPlane& AliFemtoAnalysisReactionPlane::operator=(const AliFemtoAnalysisReactionPlane& TheOriginalAnalysis)
-{
-  if (this != &TheOriginalAnalysis) {
-
-    //AliFemtoAnalysisReactionPlane();
-    fVertexZ[0] = TheOriginalAnalysis.fVertexZ[0]; 
-    fVertexZ[1] = TheOriginalAnalysis.fVertexZ[1];
-    fUnderFlowVertexZ = 0; 
-    fOverFlowVertexZ = 0; 
-    fMult[0] = TheOriginalAnalysis.fMult[0]; 
-    fMult[1] = TheOriginalAnalysis.fMult[1];
-    fUnderFlowMult = 0; 
-    fOverFlowMult = 0; 
-    if (fMixingBuffer) delete fMixingBuffer;
-    fVertexZBins = TheOriginalAnalysis.fVertexZBins;
-    fMultBins = TheOriginalAnalysis.fMultBins;
-    fRPBins = TheOriginalAnalysis.fRPBins;
-    fCurrentRP = 0;
-    
-    if (fEventCut) delete fEventCut;
-    fEventCut = TheOriginalAnalysis.fEventCut->Clone();
-    
-    if (fFirstParticleCut) delete fFirstParticleCut;
-    fFirstParticleCut = TheOriginalAnalysis.fFirstParticleCut->Clone();
-    
-    if (fSecondParticleCut) delete fSecondParticleCut;
-    if (TheOriginalAnalysis.fFirstParticleCut==TheOriginalAnalysis.fSecondParticleCut) 
-      SetSecondParticleCut(fFirstParticleCut); // identical particle hbt
-    else
-      fSecondParticleCut = TheOriginalAnalysis.fSecondParticleCut->Clone();
-    
-    if (fPairCut) delete fPairCut;
-    fPairCut = TheOriginalAnalysis.fPairCut->Clone();
-    
-    if ( fEventCut ) {
-      SetEventCut(fEventCut); // this will set the myAnalysis pointer inside the cut
-    }
-    if ( fFirstParticleCut ) {
-      SetFirstParticleCut(fFirstParticleCut); // this will set the myAnalysis pointer inside the cut
-    }
-    if ( fSecondParticleCut ) {
-      SetSecondParticleCut(fSecondParticleCut); // this will set the myAnalysis pointer inside the cut
-    }  if ( fPairCut ) {
-      SetPairCut(fPairCut); // this will set the myAnalysis pointer inside the cut
-    }
-    
-    if (fPicoEventCollectionVectorHideAway) delete fPicoEventCollectionVectorHideAway;
-    fPicoEventCollectionVectorHideAway = new AliFemtoPicoEventCollectionVectorHideAway(fVertexZBins,fVertexZ[0],fVertexZ[1],
-                                                                                      fMultBins,fMult[0],fMult[1],
-                                                                                      fRPBins,0.0,TMath::Pi());
-    
-    AliFemtoCorrFctnIterator iter;
-    for (iter=TheOriginalAnalysis.fCorrFctnCollection->begin(); iter!=TheOriginalAnalysis.fCorrFctnCollection->end();iter++){
-      AliFemtoCorrFctn* fctn = (*iter)->Clone();
-      if (fctn) AddCorrFctn(fctn);
-    }
-    
-    fNumEventsToMix = TheOriginalAnalysis.fNumEventsToMix;
-
-  }
-
-  return *this;
-}
-
-//____________________________
-AliFemtoAnalysisReactionPlane::~AliFemtoAnalysisReactionPlane(){
-  // now delete every PicoEvent in the EventMixingBuffer and then the Buffer itself
-  delete fPicoEventCollectionVectorHideAway;
-}
-
-//____________________________
-AliFemtoString AliFemtoAnalysisReactionPlane::Report()
-{
-  // Prepare a report of the execution
-  cout << "AliFemtoAnalysisReactionPlane - constructing Report..."<<endl;
-  char ctemp[200];
-  AliFemtoString temp = "-----------\nHbt AliFemtoAnalysisReactionPlane Report:\n";
-  snprintf(ctemp , 200, "Events are mixed in %d VertexZ bins in the range %E cm to %E cm.\n",fVertexZBins,fVertexZ[0],fVertexZ[1]);
-  temp += ctemp;
-  snprintf(ctemp , 200, "Events underflowing: %d\n",fUnderFlowVertexZ);
-  temp += ctemp;
-  snprintf(ctemp , 200, "Events overflowing: %d\n",fOverFlowVertexZ);
-  temp += ctemp;
-  snprintf(ctemp , 200, "Events are mixed in %d Mult bins in the range %E cm to %E cm.\n",fMultBins,fMult[0],fMult[1]);
-  temp += ctemp;
-  snprintf(ctemp , 200, "Events underflowing: %d\n",fUnderFlowMult);
-  temp += ctemp;
-  snprintf(ctemp , 200, "Events overflowing: %d\n",fOverFlowMult);
-  temp += ctemp;
-  snprintf(ctemp , 200, "Now adding AliFemtoSimpleAnalysis(base) Report\n");
-  temp += ctemp;
-  temp += AliFemtoSimpleAnalysis::Report();
-  AliFemtoString returnThis=temp;
-  return returnThis;
-}
-//_________________________
-void AliFemtoAnalysisReactionPlane::ProcessEvent(const AliFemtoEvent* hbtEvent) {
-  // Perform event processing
-  // in bins of z vertex and multiplicity
-
-  // cout << " AliFemtoAnalysisReactionPlane::ProcessEvent(const AliFemtoEvent* hbtEvent) " << endl;
-  // get right mixing buffer
-  double vertexZ = hbtEvent->PrimVertPos().z();
-  double mult = hbtEvent->UncorrectedNumberOfPrimaries();
-  fCurrentRP = hbtEvent->ReactionPlaneAngle();
-  
-  fMixingBuffer = fPicoEventCollectionVectorHideAway->PicoEventCollection(vertexZ,mult,fCurrentRP); 
-  if (!fMixingBuffer) {
-    if ( vertexZ < fVertexZ[0] ) fUnderFlowVertexZ++;
-    if ( vertexZ > fVertexZ[1] ) fOverFlowVertexZ++;
-    if ( mult < fMult[0] ) fUnderFlowMult++;
-    if ( mult > fMult[1] ) fOverFlowMult++;
-    return;
-  }
-  // call ProcessEvent() from AliFemtoSimpleAnalysis-base
-  AliFemtoSimpleAnalysis::ProcessEvent(hbtEvent);
-}
-
-double AliFemtoAnalysisReactionPlane::GetCurrentReactionPlane()
-{
-  return fCurrentRP;
-}
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoAnalysisReactionPlane.h b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoAnalysisReactionPlane.h
deleted file mode 100644 (file)
index 2283efb..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-//                                                                        //
-// AliFemtoAnalysisReactionPlane - Femtoscopic analysis which mixes event //
-// with respect to the z position of the primary vertex and event total   //
-// multiplicity and uses only events in certain reaction plane angle bin  //
-//                                                                        //
-////////////////////////////////////////////////////////////////////////////
-
-#ifndef ALIFEMTOANALYSISREACTIONPLANE_H
-#define ALIFEMTOANALYSISREACTIONPLANE_H
-
-#include "AliFemtoSimpleAnalysis.h"        // base analysis class
-
-class AliFemtoAnalysisReactionPlane : public AliFemtoSimpleAnalysis {
-
-public:
-
-  AliFemtoAnalysisReactionPlane(unsigned int binsVertex=10, double minVertex=-100., double maxVertex=+100., unsigned int binsMult=10, double minMult=-1.e9, double maxMult=+1.e9, unsigned short binsRP=10);
-  AliFemtoAnalysisReactionPlane(const AliFemtoAnalysisReactionPlane& TheOriginalAnalysis);  // copy constructor
-  AliFemtoAnalysisReactionPlane& operator=(const AliFemtoAnalysisReactionPlane& TheOriginalAnalysis); 
-  virtual void ProcessEvent(const AliFemtoEvent* ProcessThisEvent);
-  virtual ~AliFemtoAnalysisReactionPlane();
-  virtual AliFemtoString Report();       //! returns reports of all cuts applied and correlation functions being done
-  virtual unsigned int OverflowVertexZ() const { return fOverFlowVertexZ;}
-  virtual unsigned int UnderflowVertexZ() const { return fUnderFlowVertexZ;}
-  virtual unsigned int OverflowMult() const { return fOverFlowMult;}
-  virtual unsigned int UnderflowMult() const { return fUnderFlowMult;}
-  double GetCurrentReactionPlane();
-
-protected:
-  double fVertexZ[2];                 /* min/max z-vertex position allowed to be processed */
-  unsigned int fVertexZBins;          /* number of VERTEX mixing bins in z-vertex in EventMixing Buffer */
-  unsigned int fOverFlowVertexZ;      /* number of events encountered which had too large z-vertex */
-  unsigned int fUnderFlowVertexZ;     /* number of events encountered which had too small z-vertex */
-  double fMult[2];                    /* min/max multiplicity allowed for event to be processed */
-  unsigned int fMultBins;             /* number of MULTIPLICITY mixing bins in z-vertex in EventMixing Buffer */
-  unsigned int fOverFlowMult;         /* number of events encountered which had too large multiplicity */
-  unsigned int fUnderFlowMult;        /* number of events encountered which had too small multiplicity */
-  unsigned short fRPBins;             // Number of reaction plane angle orientation bins
-  double fCurrentRP;                  // Reaction plane angle of the current event
-#ifdef __ROOT__
-  ClassDef(AliFemtoAnalysisReactionPlane, 0)
-#endif
-    
-};
-
-#endif
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoBPLCMS3DCorrFctn.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoBPLCMS3DCorrFctn.cxx
deleted file mode 100644 (file)
index 77900c3..0000000
+++ /dev/null
@@ -1,461 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// AliFemtoBPLCMS3DCorrFctn: a class to calculate 3D correlation         //
-// for pairs of identical particles.                                     //
-// It also stored the weighted qinv per bin histogram for the coulomb    //
-// correction.                                                           //
-// In analysis the function should be first created in a macro, then     //
-// added to the analysis, and at the end of the macro the procedure to   //
-// write out histograms should be called.                                //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-#include "AliFemtoBPLCMS3DCorrFctn.h"
-#include "AliFemtoKTPairCut.h"
-#include "AliFemtoAnalysisReactionPlane.h"
-//#include "AliFemtoHisto.h"
-#include <cstdio>
-
-#ifdef __ROOT__ 
-ClassImp(AliFemtoBPLCMS3DCorrFctn)
-#endif
-
-//____________________________
-AliFemtoBPLCMS3DCorrFctn::AliFemtoBPLCMS3DCorrFctn(char* title, const int& nbins, const float& QLo, const float& QHi)
-  :
-  AliFemtoCorrFctn(),
-//   fIDNumHisto(0),
-//   fIDDenHisto(0),
-//   fIDRatHisto(0),
-//   fSMNumHisto(0),
-//   fSMDenHisto(0),
-//   fSMRatHisto(0),
-//   fCorrectionHisto(0),
-//   fCorrCFHisto(0),
-  fNumerator(0),
-  fDenominator(0),
-  fRatio(0),
-  fQinvHisto(0),
-  fLambda(0),
-  fRout2(0),
-  fRside2(0),
-  fRlong2(0),
-  fQinvNormLo(0),
-  fQinvNormHi(0),
-  fNumRealsNorm(0),
-  fNumMixedNorm(0),
-  fUseRPSelection(0)
-{
-  // Basic constructor
-  // set some stuff...
-  fQinvNormLo = (QHi-QLo)*0.8;
-  fQinvNormHi = (QHi-QLo)*0.8;
-  fNumRealsNorm = 0;
-  fNumMixedNorm = 0;
-  //  fCorrection = 0;  // pointer to Coulomb Correction object
-
-  //  fSmearPair = 0; // no resolution correction unless user sets SmearPair
-
-  // set up numerator
-  char tTitNum[101] = "Num";
-  strncat(tTitNum,title, 100);
-  fNumerator = new TH3D(tTitNum,title,nbins,-QHi,QHi,nbins,-QHi,QHi,nbins,-QHi,QHi);
-  // set up denominator
-  char tTitDen[101] = "Den";
-  strncat(tTitDen,title, 100);
-  fDenominator = new TH3D(tTitDen,title,nbins,-QHi,QHi,nbins,-QHi,QHi,nbins,-QHi,QHi);
-  // set up uncorrected denominator
-  char tTitDenUncoul[101] = "DenNoCoul";
-  strncat(tTitDenUncoul,title, 100);
-  //  fUncorrectedDenominator = new TH3D(tTitDenUncoul,title,nbins,-QHi,QHi,nbins,-QHi,QHi,nbins,-QHi,QHi);
-  // set up ratio
-  char tTitRat[101] = "Rat";
-  strncat(tTitRat,title, 100);
-  fRatio = new TH3D(tTitRat,title,nbins,-QHi,QHi,nbins,-QHi,QHi,nbins,-QHi,QHi);
-  // set up ave qInv
-  char tTitQinv[101] = "Qinv";
-  strncat(tTitQinv,title, 100);
-  fQinvHisto = new TH3D(tTitQinv,title,nbins,-QHi,QHi,nbins,-QHi,QHi,nbins,-QHi,QHi);
-
-  // to enable error bar calculation...
-  fNumerator->Sumw2();
-  fDenominator->Sumw2();
-  //  fUncorrectedDenominator->Sumw2();
-  fRatio->Sumw2();
-
-//   // Following histos are for the momentum resolution correction
-//   // they are filled only if a AliFemtoSmear object is plugged in
-//   // here comes the "idea" numerator and denominator and ratio...
-//   char tTitNumID[101] = "IDNum";
-//   strncat(tTitNumID,title, 100);
-//   fIDNumHisto = new TH3D(tTitNumID,title,nbins,-QHi,QHi,nbins,-QHi,QHi,nbins,-QHi,QHi);
-//   char tTitDenID[101] = "IDDen";
-//   strncat(tTitDenID,title, 100);
-//   fIDDenHisto = new TH3D(tTitDenID,title,nbins,-QHi,QHi,nbins,-QHi,QHi,nbins,-QHi,QHi);
-//   char tTitRatID[101] = "IDRat";
-//   strncat(tTitRatID,title, 100);
-//   fIDRatHisto = new TH3D(tTitRatID,title,nbins,-QHi,QHi,nbins,-QHi,QHi,nbins,-QHi,QHi);
-
-//   fIDNumHisto->Sumw2();
-//   fIDDenHisto->Sumw2();
-//   fIDRatHisto->Sumw2();
-
-//   //
-//   // here comes the "smeared" numerator and denominator...
-//   char tTitNumSM[101] = "SMNum";
-//   strncat(tTitNumSM,title, 100);
-//   fSMNumHisto = new TH3D(tTitNumSM,title,nbins,-QHi,QHi,nbins,-QHi,QHi,nbins,-QHi,QHi);
-//   char tTitDenSM[101] = "SMDen";
-//   strncat(tTitDenSM,title, 100);
-//   fSMDenHisto = new TH3D(tTitDenSM,title,nbins,-QHi,QHi,nbins,-QHi,QHi,nbins,-QHi,QHi);
-//   char tTitRatSM[101] = "SMRat";
-//   strncat(tTitRatSM,title, 100);
-//   fSMRatHisto = new TH3D(tTitRatSM,title,nbins,-QHi,QHi,nbins,-QHi,QHi,nbins,-QHi,QHi);
-//   //
-//   fSMNumHisto->Sumw2();
-//   fSMDenHisto->Sumw2();
-//   fSMRatHisto->Sumw2();
-//   //
-//   // here comes the correction factor (which is just ratio of ideal ratio to smeared ratio)
-//   char tTitCorrection[101] = "CorrectionFactor";
-//   strncat(tTitCorrection,title, 100);
-//   fCorrectionHisto = new TH3D(tTitCorrection,title,nbins,-QHi,QHi,nbins,-QHi,QHi,nbins,-QHi,QHi);  
-//   fCorrectionHisto->Sumw2();
-//   // here comes the fully corrected correlation function
-//   char tTitCorrCF[101] = "CorrectedCF";
-//   strncat(tTitCorrCF,title, 100);
-//   fCorrCFHisto = new TH3D(tTitCorrCF,title,nbins,-QHi,QHi,nbins,-QHi,QHi,nbins,-QHi,QHi);
-//   fCorrCFHisto->Sumw2();
-
-  // user can (and should) override these defaults...
-  fLambda = 0.6;
-  fRout2 = 6.0*6.0;
-  fRside2 = 6.0*6.0;
-  fRlong2 = 7.0*7.0;
-
-}
-
-AliFemtoBPLCMS3DCorrFctn::AliFemtoBPLCMS3DCorrFctn(const AliFemtoBPLCMS3DCorrFctn& aCorrFctn) :
-  AliFemtoCorrFctn(aCorrFctn),
-//   fIDNumHisto(0),
-//   fIDDenHisto(0),
-//   fIDRatHisto(0),
-//   fSMNumHisto(0),
-//   fSMDenHisto(0),
-//   fSMRatHisto(0),
-//   fCorrectionHisto(0),
-//   fCorrCFHisto(0),
-  fNumerator(0),
-  fDenominator(0),
-  fRatio(0),
-  fQinvHisto(0),
-  fLambda(0),
-  fRout2(0),
-  fRside2(0),
-  fRlong2(0),
-  fQinvNormLo(0),
-  fQinvNormHi(0),
-  fNumRealsNorm(0),
-  fNumMixedNorm(0),
-  fUseRPSelection(0)
-{
-  // Copy constructor
-//   fIDNumHisto = new TH3D(*aCorrFctn.fIDNumHisto);
-//   fIDDenHisto = new TH3D(*aCorrFctn.fIDDenHisto);
-//   fIDRatHisto = new TH3D(*aCorrFctn.fIDRatHisto);
-//   fSMNumHisto = new TH3D(*aCorrFctn.fSMNumHisto);
-//   fSMDenHisto = new TH3D(*aCorrFctn.fSMDenHisto);
-//   fSMRatHisto = new TH3D(*aCorrFctn.fSMRatHisto);
-//   fCorrectionHisto = new TH3D(*aCorrFctn.fCorrectionHisto);
-//   fCorrCFHisto = new TH3D(*aCorrFctn.fCorrCFHisto);
-  fNumerator = new TH3D(*aCorrFctn.fNumerator);
-  fDenominator = new TH3D(*aCorrFctn.fDenominator);
-  fRatio = new TH3D(*aCorrFctn.fRatio);
-  fQinvHisto = new TH3D(*aCorrFctn.fQinvHisto);
-  fLambda = aCorrFctn.fLambda;
-  fRout2 = aCorrFctn.fRout2;
-  fRside2 = aCorrFctn.fRside2;
-  fRlong2 = aCorrFctn.fRlong2;
-  fQinvNormLo = aCorrFctn.fQinvNormLo;
-  fQinvNormHi = aCorrFctn.fQinvNormHi;
-  fNumRealsNorm = aCorrFctn.fNumRealsNorm;
-  fNumMixedNorm = aCorrFctn.fNumMixedNorm;
-  fUseRPSelection = aCorrFctn.fUseRPSelection;
-}
-//____________________________
-AliFemtoBPLCMS3DCorrFctn::~AliFemtoBPLCMS3DCorrFctn(){
-  // Destructor
-  delete fNumerator;
-  delete fDenominator;
-  delete fRatio;
-  delete fQinvHisto;
-//   delete fIDNumHisto;
-//   delete fIDDenHisto;
-//   delete fIDRatHisto;
-//   delete fSMNumHisto;
-//   delete fSMDenHisto;
-//   delete fSMRatHisto;
-//   delete fCorrectionHisto;
-//   delete fCorrCFHisto;
-}
-//_________________________
-AliFemtoBPLCMS3DCorrFctn& AliFemtoBPLCMS3DCorrFctn::operator=(const AliFemtoBPLCMS3DCorrFctn& aCorrFctn)
-{
-  // assignment operator
-  if (this == &aCorrFctn)
-    return *this;
-//   if (fIDNumHisto) delete fIDNumHisto;
-//   fIDNumHisto = new TH3D(*aCorrFctn.fIDNumHisto);
-//   if (fIDDenHisto) delete fIDDenHisto;
-//   fIDDenHisto = new TH3D(*aCorrFctn.fIDDenHisto);
-//   if (fIDRatHisto) delete fIDRatHisto;
-//   fIDRatHisto = new TH3D(*aCorrFctn.fIDRatHisto);
-//   if (fSMNumHisto) delete fSMNumHisto;
-//   fSMNumHisto = new TH3D(*aCorrFctn.fSMNumHisto);
-//   if (fSMDenHisto) delete fSMDenHisto;
-//   fSMDenHisto = new TH3D(*aCorrFctn.fSMDenHisto);
-//   if (fSMRatHisto) delete fSMRatHisto;
-//   fSMRatHisto = new TH3D(*aCorrFctn.fSMRatHisto);
-
-//   if (fCorrectionHisto) delete fCorrectionHisto;
-//   fCorrectionHisto = new TH3D(*aCorrFctn.fCorrectionHisto);
-//   if (fCorrCFHisto) delete fCorrCFHisto;
-//   fCorrCFHisto = new TH3D(*aCorrFctn.fCorrCFHisto);
-  if (fNumerator) delete fNumerator;
-  fNumerator = new TH3D(*aCorrFctn.fNumerator);
-  if (fDenominator) delete fDenominator;
-  fDenominator = new TH3D(*aCorrFctn.fDenominator);
-  if (fRatio) delete fRatio;
-  fRatio = new TH3D(*aCorrFctn.fRatio);
-  if (fQinvHisto) delete fQinvHisto;
-  fQinvHisto = new TH3D(*aCorrFctn.fQinvHisto);
-
-  fLambda = aCorrFctn.fLambda;
-  fRout2 = aCorrFctn.fRout2;
-  fRside2 = aCorrFctn.fRside2;
-  fRlong2 = aCorrFctn.fRlong2;
-  fQinvNormLo = aCorrFctn.fQinvNormLo;
-  fQinvNormHi = aCorrFctn.fQinvNormHi;
-  fNumRealsNorm = aCorrFctn.fNumRealsNorm;
-  fNumMixedNorm = aCorrFctn.fNumMixedNorm;
-  fUseRPSelection = aCorrFctn.fUseRPSelection;
-
-  return *this;
-}
-
-//_________________________
-void AliFemtoBPLCMS3DCorrFctn::WriteOutHistos(){
-  // Write out all histograms to file
-  fNumerator->Write();
-  fDenominator->Write();
-  //  fUncorrectedDenominator->Write();
-  fRatio->Write();
-  fQinvHisto->Write();
-
-  /*
-    if (fSmearPair){
-    fIDNumHisto->Write();
-    fIDDenHisto->Write();
-    fIDRatHisto->Write();
-    //
-    fSMNumHisto->Write();
-    fSMDenHisto->Write();
-    fSMRatHisto->Write();
-    //
-    fCorrectionHisto->Write();
-    fCorrCFHisto->Write();
-    }
-  */
-}
-//______________________________
-TList* AliFemtoBPLCMS3DCorrFctn::GetOutputList()
-{
-  // Prepare the list of objects to be written to the output
-  TList *tOutputList = new TList();
-
-  tOutputList->Add(fNumerator); 
-  tOutputList->Add(fDenominator);  
-  tOutputList->Add(fQinvHisto);  
-
-  return tOutputList;
-}
-
-//_________________________
-void AliFemtoBPLCMS3DCorrFctn::Finish(){
-  // here is where we should normalize, fit, etc...
-  double tNumFact,tDenFact;
-  if ((fNumRealsNorm !=0) && (fNumMixedNorm !=0)){
-    tNumFact = double(fNumRealsNorm);
-    tDenFact = double(fNumMixedNorm);
-  }
-  // can happen that the fNumRealsNorm and fNumMixedNorm = 0 if you do non-standard
-  //   things like making a new CorrFctn and just setting the Numerator and Denominator
-  //   from OTHER CorrFctns which you read in (like when doing parallel processing) 
-  else{
-    cout << "Warning! - no normalization constants defined - I do the best I can..." << endl;
-    int nbins = fNumerator->GetNbinsX();
-    int half_way = nbins/2;
-    tNumFact = fNumerator->Integral(half_way,nbins,half_way,nbins,half_way,nbins);
-    tDenFact = fDenominator->Integral(half_way,nbins,half_way,nbins,half_way,nbins);
-  }
-
-  fRatio->Divide(fNumerator,fDenominator,tDenFact,tNumFact);
-  //  fQinvHisto->Divide(fUncorrectedDenominator);
-  fQinvHisto->Divide(fDenominator);
-
-  /*
-  // now do all the resolution correction stuff..
-  if (fSmearPair){  // but only do it if we have been working with a SmearPair
-  fIDRatHisto->Divide(fIDNumHisto,fIDDenHisto);
-  fSMRatHisto->Divide(fSMNumHisto,fSMDenHisto);
-  fCorrectionHisto->Divide(fIDRatHisto,fSMRatHisto);
-  fCorrCFHisto->Multiply(fRatio,fCorrectionHisto);
-  }
-  */
-
-}
-
-//____________________________
-AliFemtoString AliFemtoBPLCMS3DCorrFctn::Report(){
-  // Construct the report
-  string stemp = "LCMS Frame Bertsch-Pratt 3D Correlation Function Report:\n";
-  char ctemp[100];
-  snprintf(ctemp , 100, "Number of entries in numerator:\t%E\n",fNumerator->GetEntries());
-  stemp += ctemp;
-  snprintf(ctemp , 100, "Number of entries in denominator:\t%E\n",fDenominator->GetEntries());
-  stemp += ctemp;
-  snprintf(ctemp , 100, "Number of entries in ratio:\t%E\n",fRatio->GetEntries());
-  stemp += ctemp;
-  snprintf(ctemp , 100, "Normalization region in Qinv was:\t%E\t%E\n",fQinvNormLo,fQinvNormHi);
-  stemp += ctemp;
-  snprintf(ctemp , 100, "Number of pairs in Normalization region was:\n");
-  stemp += ctemp;
-  snprintf(ctemp , 100, "In numerator:\t%lu\t In denominator:\t%lu\n",fNumRealsNorm,fNumMixedNorm);
-  stemp += ctemp;
-  /*  if (fCorrection)
-      {
-      float radius = fCorrection->GetRadius();
-      snprintf(ctemp , 100, "Coulomb correction used radius of\t%E\n",radius);
-      }
-      else
-      {
-      snprintf(ctemp , 100, "No Coulomb Correction applied to this CorrFctn\n");
-      }
-      stemp += ctemp;
-  */
-
-  if (fPairCut){
-    snprintf(ctemp , 100, "Here is the PairCut specific to this CorrFctn\n");
-    stemp += ctemp;
-    stemp += fPairCut->Report();
-  }
-  else{
-    snprintf(ctemp , 100, "No PairCut specific to this CorrFctn\n");
-    stemp += ctemp;
-  }
-
-  //  
-  AliFemtoString returnThis = stemp;
-  return returnThis;
-}
-//____________________________
-void AliFemtoBPLCMS3DCorrFctn::AddRealPair( AliFemtoPair* pair){
-  // perform operations on real pairs
-  if (fPairCut){
-    if (fUseRPSelection) {
-      AliFemtoKTPairCut *ktc = dynamic_cast<AliFemtoKTPairCut *>(fPairCut);
-      if (!ktc) { 
-       cout << "RP aware cut requested, but not connected to the CF" << endl;
-       if (!(fPairCut->Pass(pair))) return;
-      }
-      else {
-       AliFemtoAnalysisReactionPlane *arp = dynamic_cast<AliFemtoAnalysisReactionPlane *> (HbtAnalysis());
-       if (!arp) {
-         cout << "RP aware cut requested, but not connected to the CF" << endl;
-         if (!(fPairCut->Pass(pair))) return;
-       }
-       else if (!(ktc->Pass(pair, arp->GetCurrentReactionPlane()))) return;
-      }
-    }
-    else
-      if (!(fPairCut->Pass(pair))) return;
-  }
-
-  double tQinv = fabs(pair->QInv());   // note - qInv() will be negative for identical pairs...
-  if ((tQinv < fQinvNormHi) && (tQinv > fQinvNormLo)) fNumRealsNorm++;
-  double qOut = (pair->QOutCMS());
-  double qSide = (pair->QSideCMS());
-  double qLong = (pair->QLongCMS());
-
-  fNumerator->Fill(qOut,qSide,qLong);
-}
-//____________________________
-void AliFemtoBPLCMS3DCorrFctn::AddMixedPair( AliFemtoPair* pair){
-  // perform operations on mixed pairs
-//   if (fPairCut){
-//     if (!(fPairCut->Pass(pair))) return;
-//   }
-  if (fPairCut){
-    if (fUseRPSelection) {
-      AliFemtoKTPairCut *ktc = dynamic_cast<AliFemtoKTPairCut *>(fPairCut);
-      if (!ktc) { 
-       cout << "RP aware cut requested, but not connected to the CF" << endl;
-       if (!(fPairCut->Pass(pair))) return;
-      }
-      else {
-       AliFemtoAnalysisReactionPlane *arp = dynamic_cast<AliFemtoAnalysisReactionPlane *> (HbtAnalysis());
-       if (!arp) {
-         cout << "RP aware cut requested, but not connected to the CF" << endl;
-         if (!(fPairCut->Pass(pair))) return;
-       }
-       else if (!(ktc->Pass(pair, arp->GetCurrentReactionPlane()))) return;
-      }
-    }
-    else
-      if (!(fPairCut->Pass(pair))) return;
-  }
-
-  //  double CoulombWeight = (fCorrection ? fCorrection->CoulombCorrect(pair) : 1.0);
-  double tCoulombWeight = 1.0;
-
-  double tQinv = fabs(pair->QInv());   // note - qInv() will be negative for identical pairs...
-  if ((tQinv < fQinvNormHi) && (tQinv > fQinvNormLo)) fNumMixedNorm++;
-  double qOut = (pair->QOutCMS());
-  double qSide = (pair->QSideCMS());
-  double qLong = (pair->QLongCMS());
-
-  fDenominator->Fill(qOut,qSide,qLong,tCoulombWeight);
-  //  fUncorrectedDenominator->Fill(qOut,qSide,qLong,1.0);
-  fQinvHisto->Fill(qOut,qSide,qLong,tQinv);
-
-  /*
-  // now for the momentum resolution stuff...
-  if (fSmearPair){
-      double CorrWeight =  1.0 + 
-      fLambda*exp((-qOut*qOut*fRout2 -qSide*qSide*fRside2 -qLong*qLong*fRlong2)/0.038936366329);
-    CorrWeight *= CoulombWeight;  // impt.
-
-    fIDNumHisto->Fill(qOut,qSide,qLong,CorrWeight);
-    fIDDenHisto->Fill(qOut,qSide,qLong,CoulombWeight);
-
-    fSmearPair->SetUnsmearedPair(pair);
-    double qOut_prime = fabs(fSmearPair->SmearedPair().qOutCMS());
-    double qSide_prime = fabs(fSmearPair->SmearedPair().qSideCMS());
-    double qLong_prime = fabs(fSmearPair->SmearedPair().qLongCMS());
-
-    fSMNumHisto->Fill(qOut_prime,qSide_prime,qLong_prime,CorrWeight);
-
-    double SmearedCoulombWeight = ( fCorrection ? 
-                                   fCorrection->CoulombCorrect(&(fSmearPair->SmearedPair())) : 
-                                   1.0);
-
-    fSMDenHisto->Fill(qOut_prime,qSide_prime,qLong_prime,SmearedCoulombWeight);
-  }
-  */
-}
-
-
-void AliFemtoBPLCMS3DCorrFctn::SetUseRPSelection(unsigned short aRPSel)
-{
-  fUseRPSelection = aRPSel;
-}
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoBPLCMS3DCorrFctn.h b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoBPLCMS3DCorrFctn.h
deleted file mode 100644 (file)
index 053eb8c..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// AliFemtoBPLCMS3DCorrFctn: a class to calculate 3D correlation         //
-// for pairs of identical particles.                                     //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-#ifndef ALIFEMTOBPLCMS3DCORRFCTN_H
-#define ALIFEMTOBPLCMS3DCORRFCTN_H
-
-#include "AliFemtoCorrFctn.h"
-//#include "AliFemtoCoulomb.h"
-#include "AliFemtoPairCut.h"
-//#include "AliFemtoHisto.h"
-#include "TH3D.h"
-//#include "AliFemtoSmearPair.h"
-
-class AliFemtoBPLCMS3DCorrFctn : public AliFemtoCorrFctn {
-public:
-  AliFemtoBPLCMS3DCorrFctn(char* title, const int& nbins, const float& QLo, const float& QHi);
-  AliFemtoBPLCMS3DCorrFctn(const AliFemtoBPLCMS3DCorrFctn& aCorrFctn);
-  virtual ~AliFemtoBPLCMS3DCorrFctn();
-
-  AliFemtoBPLCMS3DCorrFctn& operator=(const AliFemtoBPLCMS3DCorrFctn& aCorrFctn);
-
-  virtual AliFemtoString Report();
-  virtual void AddRealPair( AliFemtoPair* aPair);
-  virtual void AddMixedPair( AliFemtoPair* aPair);
-
-  virtual void Finish();
-
-  TH3D* Numerator();
-  TH3D* Denominator();
-  TH3D* Ratio();
-  TH3D* QinvHisto();
-
-  // here are get and set for the range over which the correlation function 
-  // is normalized (in Qinv).  The range is set to 0.15..0.18 in the constuctor
-  // by default, but the Set's below override this
-  void SetNormRangeLo(float qLo);
-  void SetNormRangeHi(float qHi);
-  float GetNormRangeLo() const;
-  float GetNormRangeHi() const;
-
-  void WriteOutHistos();
-  virtual TList* GetOutputList();
-
-  //  void SetCoulombCorrection(AliFemtoCoulomb* Correction);
-
-  void SetUseRPSelection(unsigned short aRPSel);
-
-  //  void SetSmearPair(AliFemtoSmearPair*);
-  void SetRout(double guess);
-  void SetRside(double guess);
-  void SetRlong(double guess);
-  void SetLambda(double guess);
-
-private:
-/*   // here are a whole bunch of histos that get filled if we do resolution correction */
-/*   TH3D* fIDNumHisto;        // true pairs numerator   */
-/*   TH3D* fIDDenHisto;        // true pairs denominator */
-/*   TH3D* fIDRatHisto;        // true pairs ratio       */
-/*   //  */
-/*   TH3D* fSMNumHisto;        // mixed pairs numerator   */
-/*   TH3D* fSMDenHisto;            // mixed pairs denominator */
-/*   TH3D* fSMRatHisto;            // mixed pairs ratio       */
-/*   // */
-/*   TH3D* fCorrectionHisto;   // correction histogram */
-/*   TH3D* fCorrCFHisto;       // Corrected CF */
-
-  TH3D* fNumerator;         // numerator
-  TH3D* fDenominator;       // denominator
-  //  TH3D* fUncorrectedDenominator;
-  TH3D* fRatio;             // ratio - the correlation function
-  TH3D* fQinvHisto;         // Qinv weights
-
-  // for resolution correction
-  //  AliFemtoSmearPair* fSmearPair; //!
-  double fLambda;           // lambda for smearing correction
-  double fRout2;            // Rout for smearing correction
-  double fRside2;           // Rside for smearing correction
-  double fRlong2;           // Rlong for smearing correction
-
-  // upper and lower bounds of Qinv region where to do normalization
-  float fQinvNormLo;        // Lower bound of Qinv normalization range
-  float fQinvNormHi;        // Upper bound of Qinv normalization range
-
-  // and here are the number of pairs in that region...
-  unsigned long int fNumRealsNorm; // pairs in numerator in Qinv normalization range
-  unsigned long int fNumMixedNorm; // pairs in denominator in Qinv normalization range
-
- protected:
-  unsigned short fUseRPSelection;  // The pair cut uses RP selection
-
-  //  AliFemtoCoulomb* fCorrection; //!
-  
-
-#ifdef __ROOT__
-  ClassDef(AliFemtoBPLCMS3DCorrFctn, 1)
-#endif
-};
-
-inline  TH3D* AliFemtoBPLCMS3DCorrFctn::Numerator(){return fNumerator;}
-inline  TH3D* AliFemtoBPLCMS3DCorrFctn::Denominator(){return fDenominator;}
-//inline  TH3D* AliFemtoBPLCMS3DCorrFctn::UncorrectedDenominator(){return fUncorrectedDenominator;}
-inline  TH3D* AliFemtoBPLCMS3DCorrFctn::Ratio(){return fRatio;}
-inline  TH3D* AliFemtoBPLCMS3DCorrFctn::QinvHisto(){return fQinvHisto;}
-inline  void AliFemtoBPLCMS3DCorrFctn::SetNormRangeLo(float qLo){fQinvNormLo = qLo;}
-inline  void AliFemtoBPLCMS3DCorrFctn::SetNormRangeHi(float qHi){fQinvNormHi = qHi;}
-inline  float AliFemtoBPLCMS3DCorrFctn::GetNormRangeLo() const{return fQinvNormLo;}
-inline  float AliFemtoBPLCMS3DCorrFctn::GetNormRangeHi() const{return fQinvNormHi;}
-//inline  void AliFemtoBPLCMS3DCorrFctn::SetCoulombCorrection(AliFemtoCoulomb* Correction){fCorrection = Correction;}
-//inline  void AliFemtoBPLCMS3DCorrFctn::SetSmearPair(AliFemtoSmearPair* sp){fSmearPair = sp;}
-
-inline  void AliFemtoBPLCMS3DCorrFctn::SetRout(double r){fRout2 = r*r;}
-inline  void AliFemtoBPLCMS3DCorrFctn::SetRside(double r){fRside2 = r*r;}
-inline  void AliFemtoBPLCMS3DCorrFctn::SetRlong(double r){fRlong2 = r*r;}
-inline  void AliFemtoBPLCMS3DCorrFctn::SetLambda(double l){fLambda = l;}
-
-#endif
-
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoBasicEventCut.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoBasicEventCut.cxx
deleted file mode 100644 (file)
index 149a99c..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//                                                                            //
-// AliFemtoBasicEventCut - the basic cut for events.                          //
-// Only cuts on event multiplicity and z-vertex position                      //
-//                                                                            //
-////////////////////////////////////////////////////////////////////////////////
-
-#include "AliFemtoBasicEventCut.h"
-//#include <cstdio>
-
-#ifdef __ROOT__
-ClassImp(AliFemtoBasicEventCut)
-#endif
-
-AliFemtoBasicEventCut::AliFemtoBasicEventCut() :
-  AliFemtoEventCut(),
-  fEventMult(),
-  fVertZPos(),
-  fAcceptBadVertex(false), 
-  fNEventsPassed(0), 
-  fNEventsFailed(0),
-  fAcceptOnlyPhysics(true),
-  fSelectTrigger(0)
-{
-  // Default constructor
-  fEventMult[0] = 0;
-  fEventMult[1] = 100000;
-  fVertZPos[0] = -100.0;
-  fVertZPos[1] = 100.0;
-} 
-//------------------------------
-AliFemtoBasicEventCut::~AliFemtoBasicEventCut(){
-  // Default destructor
-}
-//------------------------------
-bool AliFemtoBasicEventCut::Pass(const AliFemtoEvent* event){
-  // Pass events if they fall within the multiplicity and z-vertex
-  // position range. Fail otherwise
-  //  int mult =  event->NumberOfTracks();
-  int mult = (int) event->UncorrectedNumberOfPrimaries();
-  double vertexZPos = event->PrimVertPos().z();
-//   cout << "AliFemtoBasicEventCut:: mult:       " << fEventMult[0] << " < " << mult << " < " << fEventMult[1] << endl;
-//   cout << "AliFemtoBasicEventCut:: VertexZPos: " << fVertZPos[0] << " < " << vertexZPos << " < " << fVertZPos[1] << endl;
-//   cout << "AliFemtoBasicEventCut:: VertexZErr: " << event->PrimVertCov()[4] << endl;
-  bool goodEvent =
-    ((mult >= fEventMult[0]) && 
-     (mult <= fEventMult[1]) && 
-     (vertexZPos > fVertZPos[0]) &&
-     (vertexZPos < fVertZPos[1]) &&
-     ((!fAcceptBadVertex) || (event->ZDCParticipants() > 1.0)) &&
-     ((!fAcceptOnlyPhysics) || (event->IsCollisionCandidate())) &&
-     ((!fSelectTrigger) || (event->TriggerCluster() == fSelectTrigger)));
-  goodEvent ? fNEventsPassed++ : fNEventsFailed++ ;
-//   cout << "AliFemtoBasicEventCut:: return : " << goodEvent << endl;
-//     (fAcceptBadVertex || (event->PrimVertCov()[4] > -1000.0)) &&
-  return (goodEvent);
-}
-//------------------------------
-AliFemtoString AliFemtoBasicEventCut::Report(){
-  // Prepare report
-  string stemp;
-  char ctemp[100];
-  snprintf(ctemp , 100, "\nMultiplicity:\t %d-%d",fEventMult[0],fEventMult[1]);
-  stemp = ctemp;
-  snprintf(ctemp , 100, "\nVertex Z-position:\t %E-%E",fVertZPos[0],fVertZPos[1]);
-  stemp += ctemp;
-  snprintf(ctemp , 100, "\nNumber of events which passed:\t%ld  Number which failed:\t%ld",fNEventsPassed,fNEventsFailed);
-  stemp += ctemp;
-  AliFemtoString returnThis = stemp;
-  return returnThis;
-}
-void AliFemtoBasicEventCut::SetAcceptBadVertex(bool b)
-{
-  fAcceptBadVertex = b;
-}
-bool AliFemtoBasicEventCut::GetAcceptBadVertex()
-{
-  return fAcceptBadVertex;
-}
-void AliFemtoBasicEventCut::SetAcceptOnlyPhysics(bool b)
-{
-  fAcceptOnlyPhysics = b;
-}
-bool AliFemtoBasicEventCut::GetAcceptOnlyPhysics()
-{
-  return fAcceptOnlyPhysics;
-}
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoBasicEventCut.h b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoBasicEventCut.h
deleted file mode 100644 (file)
index f991459..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//                                                                            //
-// AliFemtoBasicEventCut - the basic cut for events.                          //
-// Only cuts on event multiplicity and z-vertex position                      //
-//                                                                            //
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef ALIFEMTOBASICEVENTCUT_H
-#define ALIFEMTOBASICEVENTCUT_H
-
-// do I need these lines ?
-//#ifndef StMaker_H
-//#include "StMaker.h"
-//#endif
-
-#include "AliFemtoEventCut.h"
-
-class AliFemtoBasicEventCut : public AliFemtoEventCut {
-
-public:
-
-  AliFemtoBasicEventCut();
-  AliFemtoBasicEventCut(AliFemtoBasicEventCut& c);
-  virtual ~AliFemtoBasicEventCut();
-  AliFemtoBasicEventCut& operator=(AliFemtoBasicEventCut& c);
-
-  void SetEventMult(const int& lo,const int& hi);
-  void SetVertZPos(const float& lo, const float& hi);
-  void SetAcceptBadVertex(bool b);
-  void SetAcceptOnlyPhysics(bool b);
-  int NEventsPassed() const;
-  int NEventsFailed() const;
-  bool GetAcceptBadVertex();
-  bool GetAcceptOnlyPhysics();
-  void SetTriggerSelection(int trig);
-
-  virtual AliFemtoString Report();
-  virtual bool Pass(const AliFemtoEvent* event);
-
-  AliFemtoBasicEventCut* Clone();
-
-private:   // here are the quantities I want to cut on...
-
-  int fEventMult[2];      // range of multiplicity
-  float fVertZPos[2];     // range of z-position of vertex
-  bool fAcceptBadVertex;  // Set to true to accept events with bad vertex
-  long fNEventsPassed;    // Number of events checked by this cut that passed
-  long fNEventsFailed;    // Number of events checked by this cut that failed
-  bool fAcceptOnlyPhysics;// Accept only physics events
-  int  fSelectTrigger;    // If set, only given trigger will be selected
-
-#ifdef __ROOT__
-  ClassDef(AliFemtoBasicEventCut, 1)
-#endif
-
-};
-
-inline void AliFemtoBasicEventCut::SetEventMult(const int& lo, const int& hi){fEventMult[0]=lo; fEventMult[1]=hi;}
-inline void AliFemtoBasicEventCut::SetVertZPos(const float& lo, const float& hi){fVertZPos[0]=lo; fVertZPos[1]=hi;}
-inline int  AliFemtoBasicEventCut::NEventsPassed() const {return fNEventsPassed;}
-inline int  AliFemtoBasicEventCut::NEventsFailed() const {return fNEventsFailed;}
-inline void AliFemtoBasicEventCut::SetTriggerSelection(int trig) { fSelectTrigger = trig; }
-inline AliFemtoBasicEventCut* AliFemtoBasicEventCut::Clone() { AliFemtoBasicEventCut* c = new AliFemtoBasicEventCut(*this); return c;}
-inline AliFemtoBasicEventCut::AliFemtoBasicEventCut(AliFemtoBasicEventCut& c) : AliFemtoEventCut(c), fAcceptBadVertex(false), fNEventsPassed(0), fNEventsFailed(0), fAcceptOnlyPhysics(false), fSelectTrigger(0) {
-  fEventMult[0] = c.fEventMult[0];
-  fEventMult[1] = c.fEventMult[1];
-  fVertZPos[0] = c.fVertZPos[0];
-  fVertZPos[1] = c.fVertZPos[1];
-}
-
-inline AliFemtoBasicEventCut& AliFemtoBasicEventCut::operator=(AliFemtoBasicEventCut& c) {   
-  if (this != &c) {
-    AliFemtoEventCut::operator=(c);
-    fEventMult[0] = c.fEventMult[0];
-    fEventMult[1] = c.fEventMult[1];
-    fVertZPos[0] = c.fVertZPos[0];
-    fVertZPos[1] = c.fVertZPos[1];
-  }
-
-  return *this;
-}
-
-
-#endif
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoBasicTrackCut.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoBasicTrackCut.cxx
deleted file mode 100644 (file)
index 34d0f28..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//                                                                            //
-// AliFemtoBasicTrackCut - the basic cut for tracks.                          //
-// Cuts on particle identification, transverse momentum, rapidity, distance   //
-// of closest approach to primary vertex and charge                           //
-//                                                                            //
-////////////////////////////////////////////////////////////////////////////////
-
-#include "AliFemtoBasicTrackCut.h"
-#include <cstdio>
-
-#ifdef __ROOT__ 
-ClassImp(AliFemtoBasicTrackCut)
-#endif
-
-AliFemtoBasicTrackCut::AliFemtoBasicTrackCut():
-  fCharge(0),
-  fNTracksPassed(0),
-  fNTracksFailed(0)
-{
-  // Default constructor
-  fNTracksPassed = fNTracksFailed = 0;
-  fCharge = 1;  // takes both charges 0
-  fNSigmaPion[0] = -100.0;   fNSigmaPion[1] = 100.0;
-  fNSigmaKaon[0] = -100.0;   fNSigmaKaon[1] = 100.0;
-  fNSigmaProton[0] = -100.0; fNSigmaProton[1] = 100.0;
-  fNHits[0] = 10;          fNHits[1] = 180;
-  fPt[0]=0.0;              fPt[1] = 100.0;//100
-  fRapidity[0]=-2;       fRapidity[1]=2;//-2 2
-  fDCA[0] = -1.0;           fDCA[1] = 20.0;
-
-}
-//------------------------------
-//AliFemtoBasicTrackCut::~AliFemtoBasicTrackCut(){
-//  /* noop */
-//}
-//------------------------------
-bool AliFemtoBasicTrackCut::Pass(const AliFemtoTrack* track){
-  // test the particle and return 
-  // true if it meets all the criteria
-  // false if it doesn't meet at least one of the criteria
-
-  //  return true ;  // THIS CUT IS A STHBTDUMMY!!
-
-  /*
-    cout << endl;
-    cout << "#track " << trackCount++;
-    cout << " * pion " << (track->NSigmaPion() > fNSigmaPion[0]) && (track->NSigmaPion() < fNSigmaPion[1]);
-    cout << " * kaon " << (track->NSigmaKaon() > fNSigmaKaon[0]) && (track->NSigmaKaon() < fNSigmaKaon[1]);
-    cout << " * proton " << (track->NSigmaProton() > fNSigmaProton[0]) && (track->NSigmaProton() < fNSigmaProton[1]);
-    cout << " * charge " << (track->Charge() == fCharge);
-  */
-  bool goodPID = 1;  
-  /* ----- NOT DOING PID CUTS !!!! ------
-  bool goodPID = ((track->NSigmaPion()   > fNSigmaPion[0]) &&
-                  (track->NSigmaPion()   < fNSigmaPion[1]) &&
-                  (track->NSigmaKaon()   > fNSigmaKaon[0]) &&
-                  (track->NSigmaKaon()   < fNSigmaKaon[1]) &&
-                  (track->NSigmaProton() > fNSigmaProton[0]) &&
-                  (track->NSigmaProton() < fNSigmaProton[1]));
-  ----- NOT DOING PID CUTS !!!! ------ */
-  if (fCharge !=0){               // if user requests "charge=0" then that means ignore charge
-    goodPID = (goodPID&&(track->Charge() == fCharge));
-  }
-  if (goodPID){
-    float tEnergy = ::sqrt(track->P().Mag2()+fMass*fMass);
-    float tRapidity = 0.5*::log((tEnergy+track->P().z())/
-                           (tEnergy-track->P().z()));
-
-    float tPt = ::sqrt((track->P().x())*(track->P().x())+
-                    (track->P().y())*(track->P().y()));
-
-    
-    /*
-      cout << " * DCAxy " << (track->DCAxy()  > fDCA[0]) && (track->DCAxy()  < fDCA[1]);
-      cout << " * fDCA[0] " << fDCA[0];
-      cout << " * fDCA[1] " << fDCA[1];
-      cout << " * track->DCAxy " << track->DCAxy();
-      cout << " * NHits " <<  (track->NHits() > fNHits[0]) && (track->NHits() < fNHits[1]); 
-      cout << " * tPt " << (tPt > fPt[0]) && (tPt < fPt[1]);
-      cout << " * y " << (tRapidity > fRapidity[0]) && (tRapidity < fRapidity[1]);
-      cout << endl;
-    */
-
-    bool goodTrack=
-      (//(track->DCAxy()  > fDCA[0]) &&
-     //  (track->DCAxy()  < fDCA[1]) &&
-  //     (track->NHits() > fNHits[0]) &&
-    //   (track->NHits() < fNHits[1]) &&
-       (tPt             > fPt[0]) &&
-       (tPt             < fPt[1]) &&
-       (tRapidity      > fRapidity[0]) &&
-       (tRapidity      < fRapidity[1]));
-    //  &&
-    //       (track->PidProbPion()>0.5)&&//moje
-    //       (track->PidProbMuon()<0.47)&&//moje
-    //       (track->Label()>0);//moje
-
-    //    cout << track->DCAxy() << " " << track->NHits() << " " << Pt << " " << tRapidity << " " << tEnergy << endl;
-
-    goodTrack ? fNTracksPassed++ : fNTracksFailed++;
-    return (goodTrack);
-  }
-  else{
-    fNTracksFailed++;
-    return (goodPID);
-  }
-}
-//------------------------------
-AliFemtoString AliFemtoBasicTrackCut::Report(){
-  // construct report
-  string tStemp;
-  char tCtemp[100];
-  snprintf(tCtemp , 100, "Particle mass:\t%E\n",this->Mass());
-  tStemp=tCtemp;
-  snprintf(tCtemp , 100, "Particle charge:\t%d\n",fCharge);
-  tStemp=tCtemp;
-  snprintf(tCtemp , 100, "Particle Nsigma from pion:\t%E - %E\n",fNSigmaPion[0],fNSigmaPion[1]);
-  tStemp+=tCtemp;
-  snprintf(tCtemp , 100, "Particle Nsigma from kaon:\t%E - %E\n",fNSigmaKaon[0],fNSigmaKaon[1]);
-  tStemp+=tCtemp;
-  snprintf(tCtemp , 100, "Particle Nsigma from proton:\t%E - %E\n",fNSigmaProton[0],fNSigmaProton[1]);
-  tStemp+=tCtemp;
-  snprintf(tCtemp , 100, "Particle #hits:\t%d - %d\n",fNHits[0],fNHits[1]);
-  tStemp+=tCtemp;
-  snprintf(tCtemp , 100, "Particle pT:\t%E - %E\n",fPt[0],fPt[1]);
-  tStemp+=tCtemp;
-  snprintf(tCtemp , 100, "Particle rapidity:\t%E - %E\n",fRapidity[0],fRapidity[1]);
-  tStemp+=tCtemp;
-  snprintf(tCtemp , 100, "Particle DCA:\t%E - %E\n",fDCA[0],fDCA[1]);
-  tStemp+=tCtemp;
-  snprintf(tCtemp , 100, "Number of tracks which passed:\t%ld  Number which failed:\t%ld\n",fNTracksPassed,fNTracksFailed);
-  tStemp += tCtemp;
-  AliFemtoString returnThis = tStemp;
-  return returnThis;
-}
-
-TList *AliFemtoBasicTrackCut::ListSettings()
-{
-  // return a list of settings in a writable form
-  TList *tListSetttings = new TList();
-  char buf[200];
-  snprintf(buf, 200, "AliFemtoBasicTrackCut.mass=%f", this->Mass());
-  tListSetttings->AddLast(new TObjString(buf));
-
-  snprintf(buf, 200, "AliFemtoBasicTrackCut.charge=%i", fCharge);
-  tListSetttings->AddLast(new TObjString(buf));
-  snprintf(buf, 200, "AliFemtoBasicTrackCut.nsigmapion.minimum=%f", fNSigmaPion[0]);
-  tListSetttings->AddLast(new TObjString(buf));
-  snprintf(buf, 200, "AliFemtoBasicTrackCut.nsigmapion.maximum=%f", fNSigmaPion[1]);
-  tListSetttings->AddLast(new TObjString(buf));
-  snprintf(buf, 200, "AliFemtoBasicTrackCut.nsigmakaon.minimum=%f", fNSigmaKaon[0]);
-  tListSetttings->AddLast(new TObjString(buf));
-  snprintf(buf, 200, "AliFemtoBasicTrackCut.nsigmakaon.maximum=%f", fNSigmaKaon[1]);
-  tListSetttings->AddLast(new TObjString(buf));
-  snprintf(buf, 200, "AliFemtoBasicTrackCut.nsigmaproton.minimum=%f", fNSigmaProton[0]);
-  tListSetttings->AddLast(new TObjString(buf));
-  snprintf(buf, 200, "AliFemtoBasicTrackCut.nsigmaproton.maximum=%f", fNSigmaProton[1]);
-  tListSetttings->AddLast(new TObjString(buf));
-  snprintf(buf, 200, "AliFemtoBasicTrackCut.nhits.minimum=%i", fNHits[0]);
-  tListSetttings->AddLast(new TObjString(buf));
-  snprintf(buf, 200, "AliFemtoBasicTrackCut.nhits.maximum=%i", fNHits[1]);
-  tListSetttings->AddLast(new TObjString(buf));
-  snprintf(buf, 200, "AliFemtoBasicTrackCut.pt.minimum=%f", fPt[0]);
-  tListSetttings->AddLast(new TObjString(buf));
-  snprintf(buf, 200, "AliFemtoBasicTrackCut.pt.maximum=%f", fPt[1]);
-  tListSetttings->AddLast(new TObjString(buf));
-  snprintf(buf, 200, "AliFemtoBasicTrackCut.rapidity.minimum=%f", fRapidity[0]);
-  tListSetttings->AddLast(new TObjString(buf));
-  snprintf(buf, 200, "AliFemtoBasicTrackCut.rapidity.maximum=%f", fRapidity[1]);
-  tListSetttings->AddLast(new TObjString(buf));
-  snprintf(buf, 200, "AliFemtoBasicTrackCut.dca.minimum=%f", fDCA[0]);
-  tListSetttings->AddLast(new TObjString(buf));
-  snprintf(buf, 200, "AliFemtoBasicTrackCut.dca.maximum=%f", fDCA[1]);
-  tListSetttings->AddLast(new TObjString(buf));
-
-  return tListSetttings;
-}
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoBasicTrackCut.h b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoBasicTrackCut.h
deleted file mode 100644 (file)
index d7ba801..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//                                                                            //
-// AliFemtoBasicTrackCut - the basic cut for tracks.                          //
-// Cuts on particle identification, transverse momentum, rapidity, distance   //
-// of closest approach to primary vertex and charge                           //
-//                                                                            //
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef ALIFEMTOBASICTRACKCUT_H
-#define ALIFEMTOBASICTRACKCUT_H
-
-//#ifndef StMaker_H
-//#include "StMaker.h"
-//#endif
-
-#include "AliFemtoTrackCut.h"
-
-class AliFemtoBasicTrackCut : public AliFemtoTrackCut {
-
-public:
-
-  AliFemtoBasicTrackCut();
-  //~mikesTrackCut();
-
-  virtual bool Pass(const AliFemtoTrack* tr);
-
-  virtual AliFemtoString Report();
-  virtual TList *ListSettings();
-
-  void SetNSigmaPion(const float& lo, const float& hi);
-  void SetNSigmaKaon(const float& lo, const float& hi);
-  void SetNSigmaProton(const float& lo, const float& hi);
-
-  void SetNHits(const int& lo, const int& hi);
-  void SetPt(const float& lo, const float& hi);
-  void SetRapidity(const float& lo, const float& hi);
-  void SetDCA(const float& lo, const float& hi);
-  void SetCharge(const int& ch);
-
-
-private:   // here are the quantities I want to cut on...
-
-  int               fCharge;             // charge of the track
-  float             fNSigmaPion[2];      // bounds for nsigma dEdx from pion band 
-  float             fNSigmaKaon[2];      // bounds for nsigma dEdx from kaon band
-  float             fNSigmaProton[2];    // bounds for nsigma dEdx from proton band
-  int               fNHits[2];           // bounds for number of hits
-  float             fPt[2];              // bounds for transverse momentum
-  float             fRapidity[2];        // bounds for rapidity
-  float             fDCA[2];             // bounds for DCA to primary vertex
-
-  long              fNTracksPassed;      // passed tracks counter
-  long              fNTracksFailed;      // falied tracks counter
-
-#ifdef __ROOT__ 
-  ClassDef(AliFemtoBasicTrackCut, 1)
-#endif
-};
-
-
-inline void AliFemtoBasicTrackCut::SetNSigmaPion(const float& lo, const float& hi){fNSigmaPion[0]=lo; fNSigmaPion[1]=hi;}
-inline void AliFemtoBasicTrackCut::SetNSigmaKaon(const float& lo, const float& hi){fNSigmaKaon[0]=lo; fNSigmaKaon[1]=hi;}
-inline void AliFemtoBasicTrackCut::SetNSigmaProton(const float& lo, const float& hi){fNSigmaProton[0]=lo; fNSigmaProton[1]=hi;}
-
-inline void AliFemtoBasicTrackCut::SetNHits(const int& lo, const int& hi){fNHits[0]=lo;fNHits[1]=hi;}
-inline void AliFemtoBasicTrackCut::SetPt(const float& lo, const float& hi){fPt[0]=lo; fPt[1]=hi;}
-inline void AliFemtoBasicTrackCut::SetRapidity(const float& lo,const float& hi){fRapidity[0]=lo; fRapidity[1]=hi;}
-inline void AliFemtoBasicTrackCut::SetDCA(const float& lo,const float& hi){fDCA[0]=lo; fDCA[1]=hi;}
-inline void AliFemtoBasicTrackCut::SetCharge(const int& ch){fCharge = ch;}
-
-#endif
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCorrFctn.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCorrFctn.cxx
deleted file mode 100644 (file)
index 0e25566..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-/// AliFemtoCorrFctn - the pure virtual base class for correlation function  ///
-/// All correlation function classes must inherit from this one              ///
-////////////////////////////////////////////////////////////////////////////////
-#include "AliFemtoCorrFctn.h"
-
-void AliFemtoCorrFctn::AddRealPair(AliFemtoPair*) { cout << "Not implemented" << endl; }
-void AliFemtoCorrFctn::AddMixedPair(AliFemtoPair*) { cout << "Not implemented" << endl; }
-
-AliFemtoCorrFctn::AliFemtoCorrFctn(const AliFemtoCorrFctn& /* c */):fyAnalysis(0),fPairCut(0x0) {}
-AliFemtoCorrFctn::AliFemtoCorrFctn(): fyAnalysis(0),fPairCut(0x0) {/* no-op */}
-void AliFemtoCorrFctn::SetAnalysis(AliFemtoAnalysis* analysis) { fyAnalysis = analysis; }
-AliFemtoCorrFctn& AliFemtoCorrFctn::operator=(const AliFemtoCorrFctn& aCorrFctn) { if (this == &aCorrFctn) return *this; fyAnalysis = aCorrFctn.fyAnalysis; fPairCut = aCorrFctn.fPairCut; return *this; }
-
-void AliFemtoCorrFctn::EventBegin(const AliFemtoEvent* /* aEvent */) { /* no-op */ }
-void AliFemtoCorrFctn::EventEnd(const AliFemtoEvent* /* aEvent */) { /* no-op */ }
-void AliFemtoCorrFctn::SetPairSelectionCut(AliFemtoPairCut* aCut) { fPairCut =  aCut; }
-
-#ifdef __ROOT__
-ClassImp(AliFemtoCorrFctn)
-#endif
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCorrFctn.h b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCorrFctn.h
deleted file mode 100644 (file)
index a8f6e08..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-/// AliFemtoCorrFctn - the pure virtual base class for correlation function  ///
-/// All correlation function classes must inherit from this one              ///
-////////////////////////////////////////////////////////////////////////////////
-#ifndef AliFemtoCorrFctn_hh
-#define AliFemtoCorrFctn_hh
-
-#include "AliFemtoAnalysis.h"
-#include "AliFemtoEvent.h"
-#include "AliFemtoPair.h"
-#include "AliFemtoPairCut.h"
-
-class AliFemtoCorrFctn{
-
-  friend class AliFemtoAnalysis;
-
-public:
-  AliFemtoCorrFctn();
-  AliFemtoCorrFctn(const AliFemtoCorrFctn& aCorrFctn);
-  virtual ~AliFemtoCorrFctn(){/* no-op */};
-  AliFemtoCorrFctn& operator=(const AliFemtoCorrFctn& aCorrFctn);
-
-  virtual AliFemtoString Report() = 0;
-
-  virtual void AddRealPair(AliFemtoPair* aPair);
-  virtual void AddMixedPair(AliFemtoPair* aPir);
-
-  virtual void EventBegin(const AliFemtoEvent* aEvent);
-  virtual void EventEnd(const AliFemtoEvent* aEvent);
-  virtual void Finish() = 0;
-
-  virtual TList* GetOutputList() = 0;
-
-  virtual AliFemtoCorrFctn* Clone() { return 0;}
-
-  AliFemtoAnalysis* HbtAnalysis(){return fyAnalysis;};
-  void SetAnalysis(AliFemtoAnalysis* aAnalysis);
-  void SetPairSelectionCut(AliFemtoPairCut* aCut);
-
-protected:
-  AliFemtoAnalysis* fyAnalysis; //! link to the analysis
-  AliFemtoPairCut* fPairCut;    //! this is a PairSelection criteria for this Correlation Function
-
-  private:
-
-#ifdef __ROOT__
-  ClassDef(AliFemtoCorrFctn, 1)
-#endif
-};
-
-#endif
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCorrFctn3DLCMSSym.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCorrFctn3DLCMSSym.cxx
deleted file mode 100644 (file)
index 9d6926d..0000000
+++ /dev/null
@@ -1,153 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// AliFemtoCorrFctn3DLCMSSym: a class to calculate 3D correlation        //
-// for pairs of identical particles.                                     //
-// In analysis the function should be first created in a macro, then     //
-// added to the analysis, and at the end of the macro the procedure to   //
-// write out histograms should be called.                                //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-#include "AliFemtoCorrFctn3DLCMSSym.h"
-#include <cstdio>
-
-#ifdef __ROOT__ 
-ClassImp(AliFemtoCorrFctn3DLCMSSym)
-#endif
-
-//____________________________
-AliFemtoCorrFctn3DLCMSSym::AliFemtoCorrFctn3DLCMSSym(char* title, const int& nbins, const float& QHi)
-  :
-  AliFemtoCorrFctn(),
-  fNumerator(0),
-  fDenominator(0)
-{
-  // Basic constructor
-
-  // set up numerator
-  char tTitNum[101] = "Num";
-  strncat(tTitNum,title, 100);
-  fNumerator = new TH3F(tTitNum,title,nbins,-QHi,QHi,nbins,-QHi,QHi,nbins/2,0.0,QHi);
-  // set up denominator
-  char tTitDen[101] = "Den";
-  strncat(tTitDen,title, 100);
-  fDenominator = new TH3F(tTitDen,title,nbins,-QHi,QHi,nbins,-QHi,QHi,nbins/2,0.0,QHi);
-
-  // to enable error bar calculation...
-  fNumerator->Sumw2();
-  fDenominator->Sumw2();
-}
-
-AliFemtoCorrFctn3DLCMSSym::AliFemtoCorrFctn3DLCMSSym(const AliFemtoCorrFctn3DLCMSSym& aCorrFctn) :
-  AliFemtoCorrFctn(aCorrFctn),
-  fNumerator(0),
-  fDenominator(0)
-{
-  // Copy constructor
-  fNumerator = new TH3F(*aCorrFctn.fNumerator);
-  fDenominator = new TH3F(*aCorrFctn.fDenominator);
-}
-//____________________________
-AliFemtoCorrFctn3DLCMSSym::~AliFemtoCorrFctn3DLCMSSym(){
-  // Destructor
-  delete fNumerator;
-  delete fDenominator;
-}
-//_________________________
-AliFemtoCorrFctn3DLCMSSym& AliFemtoCorrFctn3DLCMSSym::operator=(const AliFemtoCorrFctn3DLCMSSym& aCorrFctn)
-{
-  // assignment operator
-  if (this == &aCorrFctn)
-    return *this;
-
-  if (fNumerator) delete fNumerator;
-  fNumerator = new TH3F(*aCorrFctn.fNumerator);
-  if (fDenominator) delete fDenominator;
-  fDenominator = new TH3F(*aCorrFctn.fDenominator);
-
-  return *this;
-}
-
-//_________________________
-void AliFemtoCorrFctn3DLCMSSym::WriteOutHistos(){
-  // Write out all histograms to file
-  fNumerator->Write();
-  fDenominator->Write();
-}
-//______________________________
-TList* AliFemtoCorrFctn3DLCMSSym::GetOutputList()
-{
-  // Prepare the list of objects to be written to the output
-  TList *tOutputList = new TList();
-
-  tOutputList->Add(fNumerator); 
-  tOutputList->Add(fDenominator);  
-
-  return tOutputList;
-}
-
-//_________________________
-void AliFemtoCorrFctn3DLCMSSym::Finish(){
-  // here is where we should normalize, fit, etc...
-
-}
-
-//____________________________
-AliFemtoString AliFemtoCorrFctn3DLCMSSym::Report(){
-  // Construct the report
-  string stemp = "LCMS Frame Bertsch-Pratt 3D Correlation Function Report:\n";
-  char ctemp[100];
-  snprintf(ctemp , 100, "Number of entries in numerator:\t%E\n",fNumerator->GetEntries());
-  stemp += ctemp;
-  snprintf(ctemp , 100, "Number of entries in denominator:\t%E\n",fDenominator->GetEntries());
-  stemp += ctemp;
-
-  if (fPairCut){
-    snprintf(ctemp , 100, "Here is the PairCut specific to this CorrFctn\n");
-    stemp += ctemp;
-    stemp += fPairCut->Report();
-  }
-  else{
-    snprintf(ctemp , 100, "No PairCut specific to this CorrFctn\n");
-    stemp += ctemp;
-  }
-
-  //  
-  AliFemtoString returnThis = stemp;
-  return returnThis;
-}
-//____________________________
-void AliFemtoCorrFctn3DLCMSSym::AddRealPair( AliFemtoPair* pair){
-  // perform operations on real pairs
-  if (fPairCut){
-    if (!(fPairCut->Pass(pair))) return;
-  }
-
-  double qOut = (pair->QOutCMS());
-  double qSide = (pair->QSideCMS());
-  double qLong = (pair->QLongCMS());
-
-  if (qLong > 0.0)
-    fNumerator->Fill(qOut,qSide,qLong);
-  else
-    fNumerator->Fill(-qOut,-qSide,-qLong);
-    
-}
-//____________________________
-void AliFemtoCorrFctn3DLCMSSym::AddMixedPair( AliFemtoPair* pair){
-  // perform operations on mixed pairs
-  if (fPairCut){
-    if (!(fPairCut->Pass(pair))) return;
-  }
-
-  double qOut = (pair->QOutCMS());
-  double qSide = (pair->QSideCMS());
-  double qLong = (pair->QLongCMS());
-
-  if (qLong > 0.0)
-    fDenominator->Fill(qOut,qSide,qLong,1.0);
-  else
-    fDenominator->Fill(-qOut,-qSide,-qLong,1.0);
-}
-
-
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCorrFctn3DLCMSSym.h b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCorrFctn3DLCMSSym.h
deleted file mode 100644 (file)
index 561d68c..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// AliFemtoCorrFctn3DLCMSSym: a class to calculate 3D correlation        //
-// for pairs of identical particles vs. Bertsh-Pratt coordinates.        //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-#ifndef ALIFEMTOCORRFCTN3DLCMS_H
-#define ALIFEMTOCORRFCTN3DLCMS_H
-
-#include "AliFemtoCorrFctn.h"
-#include "AliFemtoPairCut.h"
-#include "TH3F.h"
-
-class AliFemtoCorrFctn3DLCMSSym : public AliFemtoCorrFctn {
-public:
-  AliFemtoCorrFctn3DLCMSSym(char* title, const int& nbins, const float& QHi);
-  AliFemtoCorrFctn3DLCMSSym(const AliFemtoCorrFctn3DLCMSSym& aCorrFctn);
-  virtual ~AliFemtoCorrFctn3DLCMSSym();
-
-  AliFemtoCorrFctn3DLCMSSym& operator=(const AliFemtoCorrFctn3DLCMSSym& aCorrFctn);
-
-  virtual AliFemtoString Report();
-  virtual void AddRealPair( AliFemtoPair* aPair);
-  virtual void AddMixedPair( AliFemtoPair* aPair);
-
-  virtual void Finish();
-
-  TH3F* Numerator();
-  TH3F* Denominator();
-
-  void WriteOutHistos();
-  virtual TList* GetOutputList();
-
-private:
-
-  TH3F* fNumerator;         // numerator
-  TH3F* fDenominator;       // denominator
-
-#ifdef __ROOT__
-  ClassDef(AliFemtoCorrFctn3DLCMSSym, 1)
-#endif
-};
-
-inline  TH3F* AliFemtoCorrFctn3DLCMSSym::Numerator(){return fNumerator;}
-inline  TH3F* AliFemtoCorrFctn3DLCMSSym::Denominator(){return fDenominator;}
-
-#endif
-
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCorrFctn3DSpherical.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCorrFctn3DSpherical.cxx
deleted file mode 100644 (file)
index e0cd28f..0000000
+++ /dev/null
@@ -1,159 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// AliFemtoCorrFctn3DSpherical: a class to calculate 3D correlation      //
-// for pairs of identical particles, binned in spherical coordinates.    //
-// In analysis the function should be first created in a macro, then     //
-// added to the analysis, and at the end of the macro the procedure to   //
-// write out histograms should be called.                                //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-#include "AliFemtoCorrFctn3DSpherical.h"
-#include <TMath.h>
-#include <cstdio>
-
-#ifdef __ROOT__ 
-ClassImp(AliFemtoCorrFctn3DSpherical)
-#endif
-
-//____________________________
-  AliFemtoCorrFctn3DSpherical::AliFemtoCorrFctn3DSpherical(char* title, const int& nqbins, const float& QLo, const float& QHi, const int& nphibins, const int& ncthetabins):
-  fNumerator(0),
-  fDenominator(0) //,
-                                                         //  fPairCut(0x0)
-{
-  // set up numerator
-  char tTitNum[101] = "Num";
-  strncat(tTitNum,title, 100);
-  fNumerator = new TH3D(tTitNum,title,nqbins,QLo,QHi,nphibins,-TMath::Pi(),TMath::Pi(),ncthetabins,-1.0,1.0);
-  // set up denominator
-  char tTitDen[101] = "Den";
-  strncat(tTitDen,title, 100);
-  fDenominator = new TH3D(tTitDen,title,nqbins,QLo,QHi,nphibins,-TMath::Pi(),TMath::Pi(),ncthetabins,-1.0,1.0);
-
-  // to enable error bar calculation...
-  fNumerator->Sumw2();
-  fDenominator->Sumw2();
-}
-
-AliFemtoCorrFctn3DSpherical::AliFemtoCorrFctn3DSpherical(const AliFemtoCorrFctn3DSpherical& aCorrFctn) :
-  AliFemtoCorrFctn(aCorrFctn),
-  fNumerator(0),
-  fDenominator(0) //,
-                                                       //  fPairCut(0x0)
-{
-  // Copy constructor
-  fNumerator = new TH3D(*aCorrFctn.fNumerator);
-  fDenominator = new TH3D(*aCorrFctn.fDenominator);
-  //  fPairCut = aCorrFctn.fPairCut;
-}
-//____________________________
-AliFemtoCorrFctn3DSpherical::~AliFemtoCorrFctn3DSpherical(){
-  // Destructor
-  delete fNumerator;
-  delete fDenominator;
-}
-//_________________________
-AliFemtoCorrFctn3DSpherical& AliFemtoCorrFctn3DSpherical::operator=(const AliFemtoCorrFctn3DSpherical& aCorrFctn)
-{
-  // assignment operator
-  if (this == &aCorrFctn)
-    return *this;
-
-  if (fNumerator) delete fNumerator;
-  fNumerator = new TH3D(*aCorrFctn.fNumerator);
-  if (fDenominator) delete fDenominator;
-  fDenominator = new TH3D(*aCorrFctn.fDenominator);
-  
-  //  fPairCut = aCorrFctn.fPairCut;
-  
-  return *this;
-}
-
-//_________________________
-void AliFemtoCorrFctn3DSpherical::WriteOutHistos(){
-  // Write out all histograms to file
-  fNumerator->Write();
-  fDenominator->Write();
-}
-//______________________________
-TList* AliFemtoCorrFctn3DSpherical::GetOutputList()
-{
-  // Prepare the list of objects to be written to the output
-  TList *tOutputList = new TList();
-
-  tOutputList->Add(fNumerator); 
-  tOutputList->Add(fDenominator);  
-
-  return tOutputList;
-}
-
-//_________________________
-void AliFemtoCorrFctn3DSpherical::Finish(){
-  // here is where we should normalize, fit, etc...
-}
-
-//____________________________
-AliFemtoString AliFemtoCorrFctn3DSpherical::Report(){
-  // Construct the report
-  string stemp = "PRF Frame Spherical 3D Correlation Function Report:\n";
-  char ctemp[100];
-  snprintf(ctemp , 100, "Number of entries in numerator:\t%E\n",fNumerator->GetEntries());
-  stemp += ctemp;
-  snprintf(ctemp , 100, "Number of entries in denominator:\t%E\n",fDenominator->GetEntries());
-  stemp += ctemp;
-
-  if (fPairCut){
-    snprintf(ctemp , 100, "Here is the PairCut specific to this CorrFctn\n");
-    stemp += ctemp;
-    stemp += fPairCut->Report();
-  }
-  else{
-    snprintf(ctemp , 100, "No PairCut specific to this CorrFctn\n");
-    stemp += ctemp;
-  }
-
-  //  
-  AliFemtoString returnThis = stemp;
-  return returnThis;
-}
-//____________________________
-void AliFemtoCorrFctn3DSpherical::AddRealPair( AliFemtoPair* pair){
-  // perform operations on real pairs
-  if (fPairCut){
-    if (!(fPairCut->Pass(pair))) return;
-  }
-
-  double tKO = pair->KOut();
-  double tKS = pair->KSide();
-  double tKL = pair->KLong();
-
-  double tKR = sqrt(tKO*tKO + tKS*tKS + tKL*tKL);
-  double tKC;
-  if ( fabs(tKR) < 1e-10 ) tKC = 0.0;
-  else tKC=tKL/tKR;
-  double tKP=atan2(tKS,tKO);
-
-  fNumerator->Fill(tKR,tKP,tKC);
-}
-//____________________________
-void AliFemtoCorrFctn3DSpherical::AddMixedPair( AliFemtoPair* pair){
-  // perform operations on mixed pairs
-  if (fPairCut){
-    if (!(fPairCut->Pass(pair))) return;
-  }
-
-  double tKO = pair->KOut();
-  double tKS = pair->KSide();
-  double tKL = pair->KLong();
-
-  double tKR = sqrt(tKO*tKO + tKS*tKS + tKL*tKL);
-  double tKC;
-  if ( fabs(tKR) < 1e-10 ) tKC = 0.0;
-  else tKC=tKL/tKR;
-  double tKP=atan2(tKS,tKO);
-
-  fDenominator->Fill(tKR,tKP,tKC);
-}
-
-
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCorrFctn3DSpherical.h b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCorrFctn3DSpherical.h
deleted file mode 100644 (file)
index de5b207..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// AliFemtoCorrFctn3DSpherical: a class to calculate 3D correlation      //
-// for pairs of identical particles, binned in spherical coordinates     //
-// (q_inv, phi, cos(theta))
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-#ifndef ALIFEMTOCORRFCTN3DSPHERICAL_H
-#define ALIFEMTOCORRFCTN3DSPHERICAL_H
-
-#include "AliFemtoCorrFctn.h"
-#include "AliFemtoPairCut.h"
-#include "TH3D.h"
-
-class AliFemtoCorrFctn3DSpherical : public AliFemtoCorrFctn {
-public:
-  AliFemtoCorrFctn3DSpherical(char* title, 
-                             const int& nqbins, const float& QLo, const float& QHi,
-                             const int& nphibins, const int& ncthetabins);
-  AliFemtoCorrFctn3DSpherical(const AliFemtoCorrFctn3DSpherical& aCorrFctn);
-  virtual ~AliFemtoCorrFctn3DSpherical();
-
-  AliFemtoCorrFctn3DSpherical& operator=(const AliFemtoCorrFctn3DSpherical& aCorrFctn);
-
-  virtual AliFemtoString Report();
-  virtual void AddRealPair( AliFemtoPair* aPair);
-  virtual void AddMixedPair( AliFemtoPair* aPair);
-
-  virtual void Finish();
-
-  void WriteOutHistos();
-  virtual TList* GetOutputList();
-
-  //  void SetSpecificPairCut(AliFemtoPairCut* aCut);
-
-private:
-  // here are a whole bunch of histos that get filled if we do resolution correction
-  TH3D* fNumerator;         // numerator
-  TH3D* fDenominator;       // denominator
-
-  //  AliFemtoPairCut* fPairCut;    //! this is a PairCut specific to THIS CorrFctn, not the Analysis
-
-#ifdef __ROOT__
-  ClassDef(AliFemtoCorrFctn3DSpherical, 1)
-#endif
-};
-
-//inline  void AliFemtoCorrFctn3DSpherical::SetSpecificPairCut(AliFemtoPairCut* pc){fPairCut=pc;}
-
-#endif
-
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCorrFctnCollection.h b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCorrFctnCollection.h
deleted file mode 100644 (file)
index 0f3ce92..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-/***************************************************************************
- *
- * $Id$
- *
- * Author: Mike Lisa, Ohio State, lisa@mps.ohio-state.edu
- ***************************************************************************
- *
- * Description: part of STAR HBT Framework: AliFemtoMaker package
- *   The CorrFctnCollection contains pointers to all Correlation Functions
- *   that are associated with a particular Analysis object.
- *
- ***************************************************************************
- *
- * $Log$
- * Revision 1.1.1.1  2007/04/25 15:38:41  panos
- * Importing the HBT code dir
- *
- * Revision 1.1.1.1  2007/03/07 10:14:49  mchojnacki
- * First version on CVS
- *
- * Revision 1.2  2000/02/01 00:33:32  laue
- * namespaces changed to run on the new Solaris Compiler CC5
- * since we can use member templates in franks1Histo.h we are doing it
- *
- * Revision 1.1.1.1  1999/06/29 16:02:57  lisa
- * Installation of AliFemtoMaker
- *
- **************************************************************************/
-
-#ifndef AliFemtoCorrFctnCollection_hh
-#define AliFemtoCorrFctnCollection_hh
-
-
-#include <list>
-#if !defined(ST_NO_NAMESPACES)
-using std::list;
-#endif
-class AliFemtoCorrFctn;
-
-#ifdef ST_NO_TEMPLATE_DEF_ARGS
-typedef list<AliFemtoCorrFctn*, allocator<AliFemtoCorrFctn*> >            AliFemtoCorrFctnCollection;
-typedef list<AliFemtoCorrFctn*, allocator<AliFemtoCorrFctn*> >::iterator  AliFemtoCorrFctnIterator;
-#else
-typedef list<AliFemtoCorrFctn*>            AliFemtoCorrFctnCollection;
-typedef list<AliFemtoCorrFctn*>::iterator  AliFemtoCorrFctnIterator;
-#endif
-
-#endif
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCorrFctnNonIdDR.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCorrFctnNonIdDR.cxx
deleted file mode 100644 (file)
index 2e85c43..0000000
+++ /dev/null
@@ -1,272 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//                                                                            //
-// AliFemtoCorrFctnNonIdDR - correlation function for non-identical particles //
-// uses k* as a function variable. Stores the correlation function separately //
-// for positive and negative signs of k* projections into out, side and long  //
-// directions, enabling the calculations of double ratios                     //
-//                                                                            //
-////////////////////////////////////////////////////////////////////////////////
-
-#include "AliFemtoCorrFctnNonIdDR.h"
-//#include "AliFemtoHisto.h"
-#include <cstdio>
-
-#ifdef __ROOT__ 
-ClassImp(AliFemtoCorrFctnNonIdDR)
-#endif
-
-//____________________________
-AliFemtoCorrFctnNonIdDR::AliFemtoCorrFctnNonIdDR(char* title, const int& nbins, const float& QinvLo, const float& QinvHi):
-  fNumOutP(0), 
-  fNumOutN(0),  
-  fNumSideP(0), 
-  fNumSideN(0), 
-  fNumLongP(0), 
-  fNumLongN(0), 
-  fDenOutP(0),  
-  fDenOutN(0),  
-  fDenSideP(0), 
-  fDenSideN(0), 
-  fDenLongP(0), 
-  fDenLongN(0)
-{
-  // Default constructor
-  // set up numerators
-  char bufname[200];
-  snprintf(bufname, 200, "NumOutP%s", title);
-  fNumOutP = new TH1D(bufname,title,nbins,QinvLo,QinvHi);
-  snprintf(bufname, 200, "NumOutN%s", title);
-  fNumOutN = new TH1D(bufname,title,nbins,QinvLo,QinvHi);
-  snprintf(bufname, 200, "NumSideP%s", title);
-  fNumSideP = new TH1D(bufname,title,nbins,QinvLo,QinvHi);
-  snprintf(bufname, 200, "NumSideN%s", title);
-  fNumSideN = new TH1D(bufname,title,nbins,QinvLo,QinvHi);
-  snprintf(bufname, 200, "NumLongP%s", title);
-  fNumLongP = new TH1D(bufname,title,nbins,QinvLo,QinvHi);
-  snprintf(bufname, 200, "NumLongN%s", title);
-  fNumLongN = new TH1D(bufname,title,nbins,QinvLo,QinvHi);
-
-  // set up denominators
-  snprintf(bufname, 200, "DenOutP%s", title);
-  fDenOutP = new TH1D(bufname,title,nbins,QinvLo,QinvHi);
-  snprintf(bufname, 200, "DenOutN%s", title);
-  fDenOutN = new TH1D(bufname,title,nbins,QinvLo,QinvHi);
-  snprintf(bufname, 200, "DenSideP%s", title);
-  fDenSideP = new TH1D(bufname,title,nbins,QinvLo,QinvHi);
-  snprintf(bufname, 200, "DenSideN%s", title);
-  fDenSideN = new TH1D(bufname,title,nbins,QinvLo,QinvHi);
-  snprintf(bufname, 200, "DenLongP%s", title);
-  fDenLongP = new TH1D(bufname,title,nbins,QinvLo,QinvHi);
-  snprintf(bufname, 200, "DenLongN%s", title);
-  fDenLongN = new TH1D(bufname,title,nbins,QinvLo,QinvHi);
-
-  // to enable error bar calculation...
-  fNumOutP->Sumw2(); 
-  fNumOutN->Sumw2();  
-  fNumSideP->Sumw2(); 
-  fNumSideN->Sumw2(); 
-  fNumLongP->Sumw2(); 
-  fNumLongN->Sumw2(); 
-  fDenOutP->Sumw2();  
-  fDenOutN->Sumw2();  
-  fDenSideP->Sumw2(); 
-  fDenSideN->Sumw2(); 
-  fDenLongP->Sumw2(); 
-  fDenLongN->Sumw2();
-}
-
-//____________________________
-AliFemtoCorrFctnNonIdDR::AliFemtoCorrFctnNonIdDR(const AliFemtoCorrFctnNonIdDR& aCorrFctn) :
-  AliFemtoCorrFctn(),
-  fNumOutP(0), 
-  fNumOutN(0),  
-  fNumSideP(0), 
-  fNumSideN(0), 
-  fNumLongP(0), 
-  fNumLongN(0), 
-  fDenOutP(0),  
-  fDenOutN(0),  
-  fDenSideP(0), 
-  fDenSideN(0), 
-  fDenLongP(0), 
-  fDenLongN(0)
-{
-  // copy constructor
-  if (aCorrFctn.fNumOutP)
-    fNumOutP = new TH1D(*aCorrFctn.fNumOutP);
-  if (aCorrFctn.fNumOutN)
-    fNumOutN = new TH1D(*aCorrFctn.fNumOutN);
-  if (aCorrFctn.fNumSideP)
-    fNumSideP = new TH1D(*aCorrFctn.fNumSideP);
-  if (aCorrFctn.fNumSideN)
-    fNumSideN = new TH1D(*aCorrFctn.fNumSideN);
-  if (aCorrFctn.fNumLongP)
-    fNumLongP = new TH1D(*aCorrFctn.fNumLongP);
-  if (aCorrFctn.fNumLongN)
-    fNumLongN = new TH1D(*aCorrFctn.fNumLongN);
-
-  if (aCorrFctn.fDenOutP)
-    fDenOutP = new TH1D(*aCorrFctn.fDenOutP);
-  if (aCorrFctn.fDenOutN)
-    fDenOutN = new TH1D(*aCorrFctn.fDenOutN);
-  if (aCorrFctn.fDenSideP)
-    fDenSideP = new TH1D(*aCorrFctn.fDenSideP);
-  if (aCorrFctn.fDenSideN)
-    fDenSideN = new TH1D(*aCorrFctn.fDenSideN);
-  if (aCorrFctn.fDenLongP)
-    fDenLongP = new TH1D(*aCorrFctn.fDenLongP);
-  if (aCorrFctn.fDenLongN)
-    fDenLongN = new TH1D(*aCorrFctn.fDenLongN);
-}
-//____________________________
-AliFemtoCorrFctnNonIdDR::~AliFemtoCorrFctnNonIdDR(){
-  delete fNumOutP; 
-  delete fNumOutN;  
-  delete fNumSideP; 
-  delete fNumSideN; 
-  delete fNumLongP; 
-  delete fNumLongN; 
-  delete fDenOutP;  
-  delete fDenOutN;  
-  delete fDenSideP; 
-  delete fDenSideN; 
-  delete fDenLongP; 
-  delete fDenLongN;
-}
-//_________________________
-AliFemtoCorrFctnNonIdDR& AliFemtoCorrFctnNonIdDR::operator=(const AliFemtoCorrFctnNonIdDR& aCorrFctn)
-{
-  // assignment operator
-  if (this == &aCorrFctn)
-    return *this;
-
-  if (aCorrFctn.fNumOutP)
-    fNumOutP = new TH1D(*aCorrFctn.fNumOutP);
-  if (aCorrFctn.fNumOutN)
-    fNumOutN = new TH1D(*aCorrFctn.fNumOutN);
-  if (aCorrFctn.fNumSideP)
-    fNumSideP = new TH1D(*aCorrFctn.fNumSideP);
-  if (aCorrFctn.fNumSideN)
-    fNumSideN = new TH1D(*aCorrFctn.fNumSideN);
-  if (aCorrFctn.fNumLongP)
-    fNumLongP = new TH1D(*aCorrFctn.fNumLongP);
-  if (aCorrFctn.fNumLongN)
-    fNumLongN = new TH1D(*aCorrFctn.fNumLongN);
-
-  if (aCorrFctn.fDenOutP)
-    fDenOutP = new TH1D(*aCorrFctn.fDenOutP);
-  if (aCorrFctn.fDenOutN)
-    fDenOutN = new TH1D(*aCorrFctn.fDenOutN);
-  if (aCorrFctn.fDenSideP)
-    fDenSideP = new TH1D(*aCorrFctn.fDenSideP);
-  if (aCorrFctn.fDenSideN)
-    fDenSideN = new TH1D(*aCorrFctn.fDenSideN);
-  if (aCorrFctn.fDenLongP)
-    fDenLongP = new TH1D(*aCorrFctn.fDenLongP);
-  if (aCorrFctn.fDenLongN)
-    fDenLongN = new TH1D(*aCorrFctn.fDenLongN);
-
-  return *this;
-}
-
-//_________________________
-void AliFemtoCorrFctnNonIdDR::Finish(){
-  // here is where we should normalize, fit, etc...
-  // we should NOT Draw() the histos (as I had done it below),
-  // since we want to insulate ourselves from root at this level
-  // of the code.  Do it instead at root command line with browser.
-  //  fNumerator->Draw();
-  //fDenominator->Draw();
-  //fRatio->Draw();
-  //  fRatio->Divide(fNumerator,fDenominator,1.0,1.0);
-
-}
-
-//____________________________
-AliFemtoString AliFemtoCorrFctnNonIdDR::Report(){
-  // construct report
-  string stemp = "Non-identical particles Correlation Function Report:\n";
-  char ctemp[100];
-  snprintf(ctemp , 100, "Number of entries in numerators:\t%E\n",fNumOutP->GetEntries()+fNumOutN->GetEntries());
-  stemp += ctemp;
-  snprintf(ctemp , 100, "Number of entries in denominators:\t%E\n",fDenOutP->GetEntries()+fDenOutN->GetEntries());
-  stemp += ctemp;
-  //  stemp += mCoulombWeight->Report();
-  AliFemtoString returnThis = stemp;
-  return returnThis;
-}
-//____________________________
-void AliFemtoCorrFctnNonIdDR::AddRealPair(AliFemtoPair* pair){
-  // add true pair
-  double tKStar = pair->KStar();
-  if (pair->KOut()>0.0)
-    fNumOutP->Fill(tKStar);
-  else
-    fNumOutN->Fill(tKStar);
-
-  if (pair->KSide()>0.0)
-    fNumSideP->Fill(tKStar);
-  else
-    fNumSideN->Fill(tKStar);
-
-  if (pair->KLong()>0.0)
-    fNumLongP->Fill(tKStar);
-  else
-    fNumLongN->Fill(tKStar);
-
-}
-//____________________________
-void AliFemtoCorrFctnNonIdDR::AddMixedPair(AliFemtoPair* pair){
-  // add mixed (background) pair
-  double tKStar = pair->KStar();
-  if (pair->KOut()>0.0)
-    fDenOutP->Fill(tKStar);
-  else
-    fDenOutN->Fill(tKStar);
-
-  if (pair->KSide()>0.0)
-    fDenSideP->Fill(tKStar);
-  else
-    fDenSideN->Fill(tKStar);
-
-  if (pair->KLong()>0.0)
-    fDenLongP->Fill(tKStar);
-  else
-    fDenLongN->Fill(tKStar);
-}
-//____________________________
-void AliFemtoCorrFctnNonIdDR::Write(){
-  fNumOutP->Write(); 
-  fNumOutN->Write();  
-  fNumSideP->Write(); 
-  fNumSideN->Write(); 
-  fNumLongP->Write(); 
-  fNumLongN->Write(); 
-  fDenOutP->Write();  
-  fDenOutN->Write();  
-  fDenSideP->Write(); 
-  fDenSideN->Write(); 
-  fDenLongP->Write(); 
-  fDenLongN->Write();
-}
-
-TList* AliFemtoCorrFctnNonIdDR::GetOutputList()
-{
-  // Prepare the list of objects to be written to the output
-  TList *tOutputList = new TList();
-
-  tOutputList->Add(fNumOutP); 
-  tOutputList->Add(fNumOutN);  
-  tOutputList->Add(fNumSideP); 
-  tOutputList->Add(fNumSideN); 
-  tOutputList->Add(fNumLongP); 
-  tOutputList->Add(fNumLongN); 
-  tOutputList->Add(fDenOutP);  
-  tOutputList->Add(fDenOutN);  
-  tOutputList->Add(fDenSideP); 
-  tOutputList->Add(fDenSideN); 
-  tOutputList->Add(fDenLongP); 
-  tOutputList->Add(fDenLongN);
-
-  return tOutputList;
-}
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCorrFctnNonIdDR.h b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCorrFctnNonIdDR.h
deleted file mode 100644 (file)
index 45edb66..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//                                                                            //
-// AliFemtoCorrFctnNonIdDR - correlation function for non-identical particles //
-// uses k* as a function variable. Stores the correlation function separately //
-// for positive and negative signs of k* projections into out, side and long  //
-// directions, enabling the calculations of double ratios                     //
-//                                                                            //
-////////////////////////////////////////////////////////////////////////////////
-#ifndef ALIFEMTOCORRFCTNNONIDDR_H
-#define ALIFEMTOCORRFCTNNONIDDR_H
-
-#include "TH1D.h"
-#include "AliFemtoCorrFctn.h"
-
-class AliFemtoCorrFctnNonIdDR : public AliFemtoCorrFctn {
-public:
-  AliFemtoCorrFctnNonIdDR(char* title, const int& nbins, const float& QinvLo, const float& QinvHi);
-  AliFemtoCorrFctnNonIdDR(const AliFemtoCorrFctnNonIdDR& aCorrFctn);
-  virtual ~AliFemtoCorrFctnNonIdDR();
-
-  AliFemtoCorrFctnNonIdDR& operator=(const AliFemtoCorrFctnNonIdDR& aCorrFctn);
-
-  virtual AliFemtoString Report();
-  virtual void AddRealPair(AliFemtoPair* aPair);
-  virtual void AddMixedPair(AliFemtoPair* aPair);
-
-  virtual void Finish();
-
-  virtual TList* GetOutputList();
-  void Write();
-
-private:
-  TH1D *fNumOutP;     // Numerator for pair with positive k*out
-  TH1D *fNumOutN;     // Numerator for pair with negative k*out
-  TH1D *fNumSideP;    // Numerator for pair with positive k*side
-  TH1D *fNumSideN;    // Numerator for pair with negative k*side
-  TH1D *fNumLongP;    // Numerator for pair with positive k*long
-  TH1D *fNumLongN;    // Numerator for pair with negative k*long
-
-  TH1D *fDenOutP;     // Denominator for pair with positive k*out
-  TH1D *fDenOutN;     // Denominator for pair with negative k*out
-  TH1D *fDenSideP;    // Denominator for pair with positive k*side
-  TH1D *fDenSideN;    // Denominator for pair with negative k*side
-  TH1D *fDenLongP;    // Denominator for pair with positive k*long
-  TH1D *fDenLongN;    // Denominator for pair with negative k*long
-
-#ifdef __ROOT__
-  ClassDef(AliFemtoCorrFctnNonIdDR, 1)
-#endif
-};
-
-
-#endif
-
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCoulomb.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCoulomb.cxx
deleted file mode 100644 (file)
index 7f905df..0000000
+++ /dev/null
@@ -1,472 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// AliFemtoCoulomb: This is a Coulomb correction class which             //
-//  1. Reads in the dat from a file                                      //  
-//  2. Performs a linear interpolation in R and creates any array of     //
-//     interpolations                                                    //
-//  3. Interpolates in eta and returns the Coulomb correction to user    //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-#include "AliFemtoCoulomb.h"
-//#include "Stiostream.h"
-#include <stdio.h>
-#include <cassert>
-//#include "PhysicalConstants.h"
-#define fine_structure_const 0.00729735
-
-#ifdef __ROOT__
-ClassImp(AliFemtoCoulomb)
-#endif
-
-AliFemtoCoulomb::AliFemtoCoulomb() :
-  fFile(""),
-  fRadius(-1.0),
-  fZ1Z2(1.0),
-  fNLines(0)
-{
-  // Default constructor
-  fFile = "/afs/rhic/star/hbt/coul/AliFemtoCorrectionFiles/correctionpp.dat";
-  if (!fFile) {
-    cout << " No file, dummy!" << endl;
-    assert(0);
-  }
-  cout << "You have 1 default Coulomb correction!" << endl;
-
-  for (int ie=0; ie<1000; ie++) {
-    fEta[ie] = 0.0;
-    fCoulomb[ie] = 0.0;
-  }
-}
-
-AliFemtoCoulomb::AliFemtoCoulomb(const AliFemtoCoulomb& aCoul) :
-  fFile(aCoul.fFile),
-  fRadius(aCoul.fRadius),
-  fZ1Z2(aCoul.fZ1Z2),
-  fNLines(0)
-{
-  // copy constructor
-  CreateLookupTable(fRadius);
-}
-
-AliFemtoCoulomb::AliFemtoCoulomb(const char* readFile, const double& radius, const double& charge) :
-  fFile(readFile),
-  fRadius(radius),
-  fZ1Z2(0),
-  fNLines(0)
-{
-  // constructor with explicit filename
-  fFile = readFile;
-  fRadius = radius;
-  CreateLookupTable(fRadius);
-  fZ1Z2 = charge;
-  cout << "You have 1 Coulomb correction!" << endl;
-}
-
-AliFemtoCoulomb::~AliFemtoCoulomb() {
-  // destructor
-}
-
-AliFemtoCoulomb& AliFemtoCoulomb::operator=(const AliFemtoCoulomb& aCoul)
-{
-  // assignment operator
-  if (this == &aCoul)
-    return *this;
-
-  fFile = aCoul.fFile;
-  fRadius = aCoul.fRadius;
-  fZ1Z2 = aCoul.fZ1Z2;
-
-  CreateLookupTable(fRadius);
-  
-  return *this;
-}
-
-
-void AliFemtoCoulomb::SetRadius(const double& radius) {
-  // set the coulomb radius
-  cout << " AliFemtoCoulomb::setRadius() " << endl;
-  fRadius = radius;
-  CreateLookupTable(fRadius);
-}
-
-double AliFemtoCoulomb::GetRadius() const {
-  // return coulomb radius
-  return (fRadius);
-}
-
-void AliFemtoCoulomb::SetFile(const char* readFile) {
-  // set the filename with coulomb calculations
-  cout << " AliFemtoCoulomb::SetFile() " << endl;
-  fFile = readFile;
-  // Create new lookup table since file has changed
-  if (fRadius>0.0) {
-    CreateLookupTable(fRadius);
-  }
-}
-
-void AliFemtoCoulomb::SetChargeProduct(const double& charge) {
-  // set pair charge
-  cout << " AliFemtoCoulomb::SetChargeProduct() " << endl;
-  if ( fZ1Z2!=charge ) { 
-    fZ1Z2 = charge;
-    if ( fZ1Z2>0 ) {
-      fFile = "/afs/rhic/star/hbt/coul/AliFemtoCorrectionFiles/correctionpp.dat";
-    }
-    else {
-      fFile = "/afs/rhic/star/hbt/coul/AliFemtoCorrectionFiles/correctionpm.dat";
-    }
-    CreateLookupTable(fRadius);
-  }
-}
-
-void AliFemtoCoulomb::CreateLookupTable(const double& radius) {
-  // Read radii from fFile
-  // Create array(pair) of linear interpolation between radii
-  cout << " AliFemtoCoulomb::CreateLookupTable() " << endl;
-
-  if (radius<0.0) {
-    cout << " AliFemtoCoulomb::CreateLookupTable -> NEGATIVE RADIUS " << endl;
-    cout << "  call AliFemtoCoulomb::SetRadius(r) with positive r " << endl;
-    cerr << " AliFemtoCoulomb::CreateLookupTable -> NEGATIVE RADIUS " << endl;
-    cerr << "  call AliFemtoCoulomb::SetRadius(r) with positive r " << endl;
-    assert(0);
-  }
-  ifstream mystream(fFile);
-  if (!mystream) {
-    cout << "Could not open file" << endl;
-    assert(0);
-  }
-  else {
-    cout << "Input correction file opened" << endl;
-  }
-
-  static char tempstring[2001];
-  static float radii[2000];
-  static int tNRadii = 0;
-  tNRadii = 0;
-  if (!mystream.getline(tempstring,2000)) {
-    cout << "Could not read radii from file" << endl;
-    assert(0);
-  }
-  for (unsigned int ii=0; ii<strlen(tempstring); ii++) {
-    while (tempstring[ii]==' ') ii++;
-    sscanf(&tempstring[ii++],"%f",&radii[++tNRadii]);
-    while ( tempstring[ii]!=' ' && (ii)<strlen(tempstring) )ii++;
-  }
-  cout << " Read " << tNRadii << " radii from file" << endl;
-
-  static double tLowRadius = -1.0;
-  static double tHighRadius = -1.0;
-  static int tLowIndex = 0;
-  tLowRadius = -1.0;
-  tHighRadius = -1.0;
-  tLowIndex = 0;
-  for(int iii=1; iii<=tNRadii-1; iii++) { // Loop to one less than #radii
-    if ( radius >= radii[iii] && radius <= radii[iii+1] ) {
-      tLowRadius = radii[iii];
-      tHighRadius = radii[iii+1];
-      tLowIndex = iii;
-    }
-  }
-  if ( (tLowRadius < 0.0) || (tHighRadius < 0.0) ) {
-    cout << "AliFemtoCoulomb::CreateLookupTable --> Problem interpolating radius" << endl;
-    cout << "  Check range of radii in lookup file...." << endl;
-    cerr << "AliFemtoCoulomb::CreateLookupTable --> Problem interpolating radius" << endl;
-    cerr << "  Check range of radii in lookup file...." << endl;
-    assert(0);
-  }
-
-  static double corr[100];           // array of corrections ... must be > tNRadii
-  fNLines = 0;
-  static double tempEta = 0;
-  tempEta = 0;
-  while (mystream >> tempEta) {
-    for (int i=1; i<=tNRadii; i++) {
-      mystream >> corr[i];
-    }
-    static double tLowCoulomb = 0;
-    static double tHighCoulomb = 0;
-    static double nCorr = 0;
-    tLowCoulomb = corr[tLowIndex];
-    tHighCoulomb = corr[tLowIndex+1];
-    nCorr = ( (radius-tLowRadius)*tHighCoulomb+(tHighRadius-radius)*tLowCoulomb )/(tHighRadius-tLowRadius);
-      fEta[fNLines] = tempEta;     // Eta
-      fCoulomb[fNLines] = nCorr;   // Interpolated Coulomb correction for radius
-      fNLines++;
-  }
-  mystream.close();
-  cout << "Lookup Table is created with " << fNLines << " points" << endl;
-}
-
-double AliFemtoCoulomb::CoulombCorrect(const double& eta) {
-  // Interpolates in eta
-  if (fRadius < 0.0) {
-    cout << "AliFemtoCoulomb::CoulombCorrect(eta) --> Trying to correct for negative radius!" << endl;
-    cerr << "AliFemtoCoulomb::CoulombCorrect(eta) --> Trying to correct for negative radius!" << endl;
-    assert(0);
-  }
-  static int middle=0;
-  middle=int( (fNLines-1)/2 );
-  if (eta*fEta[middle]<0.0) {
-    cout << "AliFemtoCoulomb::CoulombCorrect(eta) --> eta: " << eta << " has wrong sign for data file! " << endl;
-    cerr << "AliFemtoCoulomb::CoulombCorrect(eta) --> eta: " << eta << " has wrong sign for data file! " << endl;
-    assert(0);
-  }
-
-  static double tCorr = 0;
-  tCorr = -1.0;
-  
-  if ( (eta>fEta[0]) && (fEta[0]>0.0) ) {
-    tCorr = fCoulomb[0];
-    return (tCorr);
-  }
-  if ( (eta<fEta[fNLines-1]) && (fEta[fNLines-1]<0.0) ) {
-    tCorr = fCoulomb[fNLines-1];
-    return (tCorr);
-  }
-  // This is a binary search for the bracketing pair of data points
-  static int high = 0;
-  static int low = 0;
-  static int width = 0;
-  high = fNLines-1;
-  low = 0;
-  width = high-low;
-  middle = int(width/2.0); // Was instantiated above
-  while (middle > 0) {
-    if (fEta[low+middle] < eta) {
-      // eta is in the 1st half
-      high-=middle;
-      width = high-low;
-      middle = int(width/2.0);
-    }
-    else {
-      // eta is in the 2nd half
-      low+=middle;
-      width = high-low;
-      middle = int(width/2.0);
-    }
-  }
-  // Make sure we found the right one
-  if ( (fEta[low] >= eta) && (eta >= fEta[low+1]) ) {
-    static double tLowEta = 0;
-    static double tHighEta = 0;    
-    static double tLowCoulomb = 0;
-    static double tHighCoulomb = 0;
-    tLowEta = fEta[low];
-    tHighEta = fEta[low+1];    
-    tLowCoulomb = fCoulomb[low];
-    tHighCoulomb = fCoulomb[low+1];
-    //      cout << tLowEta << " *** Eta *** " << tHighEta << endl;
-    //      cout << tLowCoulomb << " *** Coulomb *** " << tHighCoulomb << endl;
-    tCorr = ( (eta-tLowEta)*tHighCoulomb+(tHighEta-eta)*tLowCoulomb )/(tHighEta-tLowEta);
-  }
-  if (tCorr<0.0) {
-    cout << "AliFemtoCoulomb::CoulombCorrect(eta) --> No correction" << endl;
-    cout << "  Check range of eta in file: Input eta  " << eta << endl;
-    cerr << "AliFemtoCoulomb::CoulombCorrect(eta) --> No correction" << endl;
-    cerr << "  Check range of eta in file: Input eta  " << eta << endl;
-    assert(0);
-  } 
-  return (tCorr);
-
-}
-
-double AliFemtoCoulomb::CoulombCorrect(const double& eta,
-                               const double& radius) {
-  // Checks radii ... input radius and fRadius
-  // Calls createLookupTable if neccessary
-  // Interpolate(linear) between etas in the created lookup table
-
-  if (radius < 0.0) {
-    if (fRadius < 0.0) {
-      // Both radii are negative
-      cout << "AliFemtoCoulomb::CoulombCorrect(eta,r) --> input and member radii are negative!" << endl;
-      cerr << "AliFemtoCoulomb::CoulombCorrect(eta,r) --> input and member radii are negative!" << endl;
-      assert(0);
-    }
-  }
-  else {
-    // radius > 0.0
-    if (radius == fRadius) {
-      // Both radii are positive and equal
-      //      cout << "Radii are the same!!!" << endl;
-    }
-    else {
-      // Both radii are positive but not equal
-      fRadius = radius;
-      CreateLookupTable(fRadius);
-    }
-  }
-
-  // Interpolate in eta
-  return ( CoulombCorrect(eta) );
-}
-
-double AliFemtoCoulomb::CoulombCorrect(const AliFemtoPair* pair) {
-  return ( CoulombCorrect( Eta(pair) ) );;
-}
-
-double AliFemtoCoulomb::CoulombCorrect(const AliFemtoPair* pair, const double& radius) {
-  return ( CoulombCorrect( Eta(pair),radius ) );
-}
-
-double AliFemtoCoulomb::Eta(const AliFemtoPair* pair) {
-  // calculate eta
-  static double px1,py1,pz1,px2,py2,pz2;
-  static double px1new,py1new,pz1new;
-  static double px2new,py2new,pz2new;
-  static double vx1cms,vy1cms,vz1cms;
-  static double vx2cms,vy2cms,vz2cms;
-  static double tVcmsX,tVcmsY,tVcmsZ;
-  static double dv = 0.0;
-  static double e1,e2,e1new,e2new;
-  static double psi,theta;
-  static double beta,gamma;
-  static double tVcmsXnew;
-
-  px1 = pair->Track1()->FourMomentum().px();
-  py1 = pair->Track1()->FourMomentum().py();
-  pz1 = pair->Track1()->FourMomentum().pz();
-  e1 = pair->Track1()->FourMomentum().e();
-  px2 = pair->Track2()->FourMomentum().px();
-  py2 = pair->Track2()->FourMomentum().py();
-  pz2 = pair->Track2()->FourMomentum().pz();
-  e2 = pair->Track2()->FourMomentum().e();
-  
-  tVcmsX = ( px1+px2 )/( e1+e2 );
-  tVcmsY = ( py1+py2 )/( e1+e2 );
-  tVcmsZ = ( pz1+pz2 )/( e1+e2 );
-  // Rotate tVcms to x-direction
-  psi = atan(tVcmsY/tVcmsX);
-  tVcmsXnew = tVcmsX*cos(psi)+tVcmsY*sin(psi);
-  tVcmsX = tVcmsXnew;
-  theta = atan(tVcmsZ/tVcmsX);
-  tVcmsXnew = tVcmsX*cos(theta)+tVcmsZ*sin(theta);
-  tVcmsX = tVcmsXnew;
-  // Gamma and Beta
-  beta = tVcmsX;
-  gamma = 1.0/::sqrt( 1.0-beta*beta );
-
-  // Rotate p1 and p2 to new frame
-  px1new = px1*cos(psi)+py1*sin(psi);
-  py1new = -px1*sin(psi)+py1*cos(psi);
-  px1 = px1new;
-  px1new = px1*cos(theta)+pz1*sin(theta);
-  pz1new = -px1*sin(theta)+pz1*cos(theta);
-  px1 = px1new;
-  py1 = py1new;
-  pz1 = pz1new;
-
-  px2new = px2*cos(psi)+py2*sin(psi);
-  py2new = -px2*sin(psi)+py2*cos(psi);
-  px2 = px2new;
-  px2new = px2*cos(theta)+pz2*sin(theta);
-  pz2new = -px2*sin(theta)+pz2*cos(theta);
-  px2 = px2new;
-  py2 = py2new;
-  pz2 = pz2new;
-
-  // Lorentz transform the x component and energy
-  e1new = gamma*e1 - gamma*beta*px1;
-  px1new = -gamma*beta*e1 + gamma*px1;
-  e2new = gamma*e2 - gamma*beta*px2;
-  px2new = -gamma*beta*e2 + gamma*px2;
-  px1 = px1new;
-  px2 = px2new;
-
-  // New velocities
-  vx1cms = px1/e1new;
-  vy1cms = py1/e1new;
-  vz1cms = pz1/e1new;
-  vx2cms = px2/e2new;
-  vy2cms = py2/e2new;
-  vz2cms = pz2/e2new;
-
-  // Velocity difference in CMS frame
-  dv = ::sqrt( (vx1cms-vx2cms)*(vx1cms-vx2cms) +
-            (vy1cms-vy2cms)*(vy1cms-vy2cms) +
-            (vz1cms-vz2cms)*(vz1cms-vz2cms) );
-
-  return ( fZ1Z2*fine_structure_const/(dv) );
-}
-
-TH1D* AliFemtoCoulomb::CorrectionHistogram(const double& mass1, const double& mass2, const int& nBins, 
-                                               const double& low, const double& high) {
-  // return correction histogram
-
-  if ( mass1!=mass2 ) {
-    cout << "Masses not equal ... try again.  No histogram created." << endl;
-    assert(0);
-  }
-  TH1D* correction = new TH1D("correction","Coulomb correction",nBins,low,high);
-  const double kReducedMass = mass1*mass2/(mass1+mass2);
-  double qInv = low;
-  //double dQinv = (high-low)/( (double)nBins );
-  double eta;
-  for (int ii=1; ii<=nBins; ii++) 
-    {
-      qInv = correction->GetBinCenter(ii);
-      eta = 2.0*fZ1Z2*kReducedMass*fine_structure_const/( qInv );
-      CoulombCorrect( eta );
-      correction->Fill( qInv, CoulombCorrect(eta,fRadius) );
-    }
-
-  return (correction);
-}
-
-#ifdef __ROOT__
-TH1D* AliFemtoCoulomb::CorrectionHistogram(const TH1D* histo, const double mass) {
-  // return correction histogram - 1D case
-  TH1D* correction = (TH1D*) ((TH1D*)histo)->Clone();
-  correction->Reset();
-  correction->SetDirectory(0);
-  int    nBins = correction->GetXaxis()->GetNbins();
-  const double kReducedMass = 0.5*mass;
-  double qInv;
-  double eta;
-  for (int ii=1; ii<=nBins; ii++) 
-    {
-      qInv = correction->GetBinCenter(ii);
-      eta = 2.0*fZ1Z2*kReducedMass*fine_structure_const/( qInv );
-      correction->Fill( qInv, CoulombCorrect(eta,fRadius) );
-    }
-
-  return (correction);
-}
-
-TH3D* AliFemtoCoulomb::CorrectionHistogram(const TH3D* histo, const double mass) {
-  // return correction histogram - 3D case
-  TH3D* correction = (TH3D*) ((TH3D*)histo)->Clone();
-  correction->Reset();
-  correction->SetDirectory(0);
-  int    nBinsX = correction->GetXaxis()->GetNbins();
-  int    nBinsY = correction->GetYaxis()->GetNbins();
-  int    nBinsZ = correction->GetZaxis()->GetNbins();
-  const double kReducedMass = 0.5*mass;
-  double eta;
-  double qInv;
-  int binNumber;
-  for (int ii=1; ii<=nBinsX; ii++) { 
-    for (int iii=1; iii<=nBinsY; iii++) {
-      for (int iv=1; iv<=nBinsZ; iv++) {
-       binNumber = histo->GetBin(ii,iii,iv);
-       qInv = histo->GetBinContent(binNumber);
-       eta = 2.0*fZ1Z2*kReducedMass*fine_structure_const/( qInv );
-       correction->SetBinContent(binNumber, CoulombCorrect(eta,fRadius) );
-      }
-    }
-  }
-  return (correction);
-}
-#endif
-
-double AliFemtoCoulomb::CoulombCorrect(const double& mass, const double& charge,
-                                   const double& radius, const double& qInv) {
-  // return correction factor
-  fRadius = radius;
-  fZ1Z2 = charge;
-  const double kReducedMass = 0.5*mass; // must be same mass particles
-  double eta = 2.0*fZ1Z2*kReducedMass*fine_structure_const/( qInv );
-  return ( CoulombCorrect(eta,fRadius) );
-}
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCoulomb.h b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCoulomb.h
deleted file mode 100644 (file)
index 468ab2b..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// AliFemtoCoulomb: This is a Coulomb correction class which             //
-//  1. Reads in the dat from a file                                      //  
-//  2. Performs a linear interpolation in R and creates any array of     //
-//     interpolations                                                    //
-//  3. Interpolates in eta and returns the Coulomb correction to user    //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-#ifndef ALIFEMTOCOULOMB_H
-#define ALIFEMTOCOULOMB_H
-
-#include <stdio.h>
-#include "AliFemtoTypes.h"
-#include "AliFemtoPair.h"
-#include "AliFemtoParticle.h"
-#include "TH1D.h"
-#include "TH3D.h"
-
-class AliFemtoCoulomb {
-
-public:
-  AliFemtoCoulomb();
-  AliFemtoCoulomb(const char *readFile, const double& radius, const double& charge);
-  AliFemtoCoulomb(const AliFemtoCoulomb& aCoul);
-  virtual ~AliFemtoCoulomb();
-
-  AliFemtoCoulomb& operator=(const AliFemtoCoulomb& aCoul);
-
-  void SetRadius(const double& radius);
-  double GetRadius() const;
-  void SetFile(const char *readFile);
-  void SetChargeProduct(const double& charge);
-
-  // These have different names so eta/Qinv don't confuse the compiler
-  double CoulombCorrect(const double& eta);
-  double CoulombCorrect(const double& eta, const double& radius);
-  double CoulombCorrect(const AliFemtoPair* pair);
-  double CoulombCorrect(const AliFemtoPair* pair, const double& radius);
-  double CoulombCorrect(const double& mass, const double& charge,
-                       const double& radius, const double& qInv);
-  TH1D* CorrectionHistogram(const double& mass1, const double& mass2, const int& nBins, 
-                                   const double& low, const double& high);
-#ifdef __ROOT__
-  TH1D* CorrectionHistogram(const TH1D*, const double);
-  TH3D* CorrectionHistogram(const TH3D*, const double);
-#endif
-private:
-  double Eta(const AliFemtoPair* pair);          // Calculates eta
-  void CreateLookupTable(const double& radius);  // Creates look-up table
-  const char* fFile;                             // File to interpolate corrections from    
-  double fRadius;                                // Radius from previous iteration
-  double fZ1Z2;                                  // Charge product of particles
-  double fEta[1000];                             // interpolated Coulomb correction table
-  double fCoulomb[1000];                         // interpolated Coulomb correction table
-  int fNLines;                                   // Number of Eta's in lookup-table
-
-#ifdef __ROOT__
-  ClassDef(AliFemtoCoulomb, 0)
-#endif
-};
-
-
-#endif
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitor.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitor.cxx
deleted file mode 100644 (file)
index 24abd40..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//                                                                            //
-// AliFemtoCutMonitor - the  base class for cut monitor                       //
-// A cut monitor saves the entities that passed and failed the given cut      //
-//                                                                            //
-////////////////////////////////////////////////////////////////////////////////
-#include "AliFemtoCutMonitor.h"
-
-inline void AliFemtoCutMonitor::EventBegin(const AliFemtoEvent* /* aEvent */ ) 
-{ /* no-op */ }
-
-inline void AliFemtoCutMonitor::EventEnd(const AliFemtoEvent* /* aEvent */ ) 
-{ /* no-op */ }
-
-inline void AliFemtoCutMonitor::Fill(const AliFemtoEvent* /* aEvent */) { 
-  // cut event
-#ifdef STHBTDEBUG
-    cout << " *** no user defined Fill(const AliFemtoEvent*), take from base class" << endl;
-#endif
-  }
-
-inline void AliFemtoCutMonitor::Fill(const AliFemtoTrack* /* aTrack */) { 
-  // cut track
-#ifdef STHBTDEBUG
-  cout << " *** no user defined Fill(const AliFemtoTrack*), take from base class" << endl;
-#endif
-}
-
-inline void AliFemtoCutMonitor::Fill(const AliFemtoV0* /* aV0 */ ) { 
-  // cut V0
-#ifdef STHBTDEBUG
-  cout << " *** no user defined Fill(const AliFemtoV0Track*), take from base class" << endl;
-#endif
-}
-inline void AliFemtoCutMonitor::Fill(const AliFemtoKink* /* aKink */) { 
-  // cut Kink
-#ifdef STHBTDEBUG
-  cout << " *** no user defined Fill(const AliFemtoKink*), take from base class" << endl;
-#endif
-}
-//-----------------------------------Gael 12/04/02------------------------------------
-inline void AliFemtoCutMonitor::Fill(const AliFemtoPair* /* aPair */) { 
-  // cut pair
-#ifdef STHBTDEBUG
-  cout << " *** no user defined Fill(const AliFemtoPair*), take from base class" << endl;
-#endif
-}
-//-----------------------------------Gael 19/06/02------------------------------------
-inline void AliFemtoCutMonitor::Fill(const AliFemtoParticleCollection* /* aCollection */) {
-  // cut particle collection
-#ifdef STHBTDEBUG
-  cout << " *** no user defined Fill(const AliFemtoParticleCollection*), take from base class" << endl;
-#endif
-}
-//-----------------------------------Gael 19/06/02------------------------------------
-inline void AliFemtoCutMonitor::Fill(const AliFemtoEvent* /* aEvent */,const AliFemtoParticleCollection* /* aCollection */) {
-  // cut event and particle collection
-#ifdef STHBTDEBUG
-  cout << " *** no user defined Fill(const AliFemtoEvent*,const AliFemtoParticleCollection*), take from base class" << endl;
-#endif
-}
-
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitor.h b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitor.h
deleted file mode 100644 (file)
index e6c0bd7..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-/// AliFemtoCutMonitor - the  base class for cut monitor                     ///
-/// A cut monitor saves the entities that passed and failed the given cut    ///
-////////////////////////////////////////////////////////////////////////////////
-#ifndef ALIFEMTOCUTMONITOR_H
-#define ALIFEMTOCUTMONITOR_H
-
-class AliFemtoEvent;
-class AliFemtoTrack;
-class AliFemtoV0;
-class AliFemtoKink;
-class AliFemtoPair; // Gael 12/04/02
-#include "AliFemtoString.h"
-#include "AliFemtoParticleCollection.h" // Gael 19/06/02
-#include <TList.h>
-
-class AliFemtoCutMonitor{
-  
-public:
-  AliFemtoCutMonitor(){/* no-op */};
-  virtual ~AliFemtoCutMonitor(){/* no-op */};
-  virtual AliFemtoString Report(){ 
-    string Stemp = "*** no user defined Fill(const AliFemtoEvent*), take from base class"; 
-    AliFemtoString returnThis = Stemp;
-    return returnThis; 
-  }
-  virtual void EventBegin(const AliFemtoEvent* aEvent);
-  virtual void EventEnd(const AliFemtoEvent* aEvent);
-  virtual TList *GetOutputList() { TList *tOutputList = new TList(); return tOutputList; };
-  virtual void Fill(const AliFemtoEvent* aEvent);
-  virtual void Fill(const AliFemtoTrack* aTrack);
-  virtual void Fill(const AliFemtoV0* aV0);
-  virtual void Fill(const AliFemtoKink* aKink);
-  virtual void Fill(const AliFemtoPair* aPair);
-  virtual void Fill(const AliFemtoParticleCollection* aCollection);
-  virtual void Fill(const AliFemtoEvent* aEvent,const AliFemtoParticleCollection* aCollection);
-  virtual void Finish() { 
-#ifdef STHBTDEBUG
-    cout << " *** no user defined Finish(), take from base class" << endl;
-#endif
-  }
-  virtual void Init() { 
-#ifdef STHBTDEBUG
-    cout << " *** no user defined Init(), take from base class" << endl;
-#endif
-  }
-};
-
-#endif
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorCollection.h b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorCollection.h
deleted file mode 100644 (file)
index fd1d947..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef AliFemtoCutMonitorCollection_hh
-#define AliFemtoCutMonitorCollection_hh
-
-
-//#include <list>
-#include <vector>
-#if !defined(ST_NO_NAMESPACES)
-using std::vector;
-#endif
-class AliFemtoCutMonitor;
-
-#ifdef ST_NO_TEMPLATE_DEF_ARGS
-typedef vector<AliFemtoCutMonitor*, allocator<AliFemtoCutMonitor*> >            AliFemtoCutMonitorCollection;
-typedef vector<AliFemtoCutMonitor*, allocator<AliFemtoCutMonitor*> >::iterator  AliFemtoCutMonitorIterator;
-#else
-typedef vector<AliFemtoCutMonitor*>            AliFemtoCutMonitorCollection;
-typedef vector<AliFemtoCutMonitor*>::iterator  AliFemtoCutMonitorIterator;
-#endif
-
-#endif
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorEventMult.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorEventMult.cxx
deleted file mode 100644 (file)
index 830010d..0000000
+++ /dev/null
@@ -1,336 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//                                                                            //
-// AliFemtoCutMonitorEventMult - the cut monitor for particles to study    //
-// the difference between reconstructed and true momentum                     //
-//                                                                            //
-////////////////////////////////////////////////////////////////////////////////
-#include "AliFemtoCutMonitorEventMult.h"
-#include "AliFemtoModelHiddenInfo.h"
-#include "AliFemtoEvent.h"
-#include <TH1D.h>
-#include <TH2D.h>
-#include <TList.h>
-
-AliFemtoCutMonitorEventMult::AliFemtoCutMonitorEventMult():
-  fEvMult(0),
-  fNormEvMult(0),
-  fSPDMult(0),
-  fMultSumPt(0),
-  freadMC(kFALSE),
-  faddhists(kFALSE),
-  fEstimateITSTPC(0),
-  fEstimateTracklets(0),
-  fEstimateITSPure(0),
-  fEst1Est2(0),
-  fEst1Est3(0),
-  fEst2Est3(0),
-  fEst1Norm(0),
-  fEst2Norm(0),
-  fEst3Norm(0)
-{
-  // Default constructor
-  fEvMult = new TH1D("EvMult", "Event Multiplicity", 5001, -0.5, 5000.5);
-  fMultSumPt = new TH2D("EvMultSumPt","Event Multiplicity vs Total pT",5001,-0.5,5000.5,1000,0.0,100.0);
-}
-
-AliFemtoCutMonitorEventMult::AliFemtoCutMonitorEventMult(const char *aName):
-  AliFemtoCutMonitor(),
-  fEvMult(0),
-  fNormEvMult(0),
-  fSPDMult(0),
-  fMultSumPt(0),
-  freadMC(kFALSE),
-  faddhists(kFALSE),
-  fEstimateITSTPC(0),
-  fEstimateTracklets(0),
-  fEstimateITSPure(0),
-  fEst1Est2(0),
-  fEst1Est3(0),
-  fEst2Est3(0),
-  fEst1Norm(0),
-  fEst2Norm(0),
-  fEst3Norm(0)
-{
-  // Normal constructor
-  char name[200];
-  snprintf(name, 200, "EvMult%s", aName);
-  fEvMult = new TH1D(name, "Event Multiplicity", 5001, -0.5, 5000.5);
-
-  snprintf(name, 200, "NormEvMult%s", aName);
-  fNormEvMult = new TH1D(name, "Normalized Event Multiplicity", 5001, -0.5, 5000.5);
-
-  if(!freadMC) {
-    snprintf(name, 200, "SPDEvMult%s", aName);
-    fSPDMult = new TH1D(name, "SPD Tracklet Multiplicity", 5001, -0.5, 5000.5);
-  }
-
-  snprintf(name, 200, "EvMultTotPt%s", aName);
-  fMultSumPt = new TH2D(name,"Event Multiplicity vs Total pT",501,-0.5,500.5,1000,0.0,100.0);
-
-  if(faddhists)
-    {
-      snprintf(name, 200, "EvMultEstITSTPC%s", aName);
-      fEstimateITSTPC = new TH1D(name, "ITS+TPC Multiplicity Estimate", 5001, -0.5, 5000.5);
-
-      snprintf(name, 200, "EvMultEstTracklets%s", aName);
-      fEstimateTracklets = new TH1D(name, "Tracklets Multiplicity Estimate", 5001, -0.5, 5000.5);
-
-      snprintf(name, 200, "EvMultEstITSPure%s", aName);
-      fEstimateITSPure = new TH1D(name, "ITS Pure Multiplicity Estimate", 8001, -0.5, 8000.5);
-
-      snprintf(name, 200, "EstITSTPCEstTracklet%s", aName);
-      fEst1Est2 = new TH2D(name,"ITS+TPC vs Tracklets",501,-0.5,5000.5,501,-0.5,500.5);
-
-      snprintf(name, 200, "EstITSTPCEstITSPure%s", aName);
-      fEst1Est3 = new TH2D(name,"ITS+TPC vs ITS Pure",501,-0.5,5000.5,801,-0.5,8000.5);
-
-      snprintf(name, 200, "EstTrackletEstITSPure%s", aName);
-      fEst2Est3 = new TH2D(name,"Tracklets vs ITS Pure",501,-0.5,5000.5,801,-0.5,8000.5);
-
-      snprintf(name, 200, "EstITSTPCNormMult%s", aName);
-      fEst1Norm = new TH2D(name,"ITS+TPC vs Normalized Mult",501,-0.5,5000.5,501,-0.5,5000.5);
-
-      snprintf(name, 200, "EstTrackletsNormMult%s", aName);
-      fEst2Norm = new TH2D(name,"Tracklets vs Normalized Mult",501,-0.5,5000.5,501,-0.5,5000.5);
-
-      snprintf(name, 200, "EstITSPureNormMult%s", aName);
-      fEst3Norm = new TH2D(name,"ITS Pure vs Normalized Mult",501,-0.5,5000.5,501,-0.5,5000.5);
-    }
-
-}
-
-AliFemtoCutMonitorEventMult::AliFemtoCutMonitorEventMult(const AliFemtoCutMonitorEventMult &aCut):
-  AliFemtoCutMonitor(),
-  fEvMult(0),
-  fNormEvMult(0),
-  fSPDMult(0),
-  fMultSumPt(0),
-  freadMC(kFALSE),
-  faddhists(kFALSE),
-  fEstimateITSTPC(0),
-  fEstimateTracklets(0),
-  fEstimateITSPure(0),
-  fEst1Est2(0),
-  fEst1Est3(0),
-  fEst2Est3(0),
-  fEst1Norm(0),
-  fEst2Norm(0),
-  fEst3Norm(0)
-{
-  // copy constructor
-  if (fEvMult) delete fEvMult;
-  fEvMult = new TH1D(*aCut.fEvMult);
-
-  if (fNormEvMult) delete fNormEvMult;
-  fNormEvMult = new TH1D(*aCut.fNormEvMult);
-
-  
-  if(!freadMC){
-    if (fSPDMult) delete fSPDMult;
-    fSPDMult = new TH1D(*aCut.fSPDMult);
-  }
-
-  if (fMultSumPt) delete fMultSumPt;
-  fMultSumPt = new TH2D(*aCut.fMultSumPt);
-
-
-  if(faddhists)
-    {
-      if (fEstimateITSTPC) delete fEstimateITSTPC;
-      fEstimateITSTPC = new TH1D(*aCut.fEstimateITSTPC);
-
-      if (fEstimateTracklets) delete fEstimateTracklets;
-      fEstimateTracklets = new TH1D(*aCut.fEstimateTracklets);
-
-      if (fEstimateITSPure) delete fEstimateITSPure;
-      fEstimateITSPure = new TH1D(*aCut.fEstimateITSPure);
-
-      if (fEst1Est2) delete fEst1Est2;
-      fEst1Est2 = new TH2D(*aCut.fEst1Est2);
-
-      if (fEst1Est3) delete fEst1Est3;
-      fEst1Est3 = new TH2D(*aCut.fEst1Est3);
-
-      if (fEst2Est3) delete fEst2Est3;
-      fEst2Est3 = new TH2D(*aCut.fEst2Est3);
-
-      if (fEst1Norm) delete fEst1Norm;
-      fEst1Norm = new TH2D(*aCut.fEst1Norm);
-
-      if (fEst2Norm) delete fEst2Norm;
-      fEst2Norm = new TH2D(*aCut.fEst2Norm);
-
-      if (fEst3Norm) delete fEst3Norm;
-      fEst3Norm = new TH2D(*aCut.fEst3Norm);
-    }
-}
-
-AliFemtoCutMonitorEventMult::~AliFemtoCutMonitorEventMult()
-{
-  // Destructor
-  delete fEvMult;
-  delete fNormEvMult;
-  if(!freadMC){
-    delete fSPDMult;
-  }
-  delete fMultSumPt;
-
-  if(faddhists)
-    {
-      delete fEstimateITSTPC;
-      delete fEstimateTracklets;
-      delete fEstimateITSPure;
-      delete fEst1Est2;
-      delete fEst1Est3;
-      delete fEst2Est3;
-      delete fEst1Norm;
-      delete fEst2Norm;
-      delete fEst3Norm;
-    }      
-}
-
-AliFemtoCutMonitorEventMult& AliFemtoCutMonitorEventMult::operator=(const AliFemtoCutMonitorEventMult& aCut)
-{
-  // assignment operator
-  if (this == &aCut) 
-    return *this;
-
-  if (fEvMult) delete fEvMult;
-  fEvMult = new TH1D(*aCut.fEvMult);
-  
-  if (fNormEvMult) delete fNormEvMult;
-  fNormEvMult = new TH1D(*aCut.fNormEvMult);
-  
-  if(!freadMC){
-    if (fSPDMult) delete fSPDMult;
-    fSPDMult = new TH1D(*aCut.fSPDMult);
-  }
-  
-  if (fMultSumPt) delete fMultSumPt;
-  fMultSumPt = new TH2D(*aCut.fMultSumPt);
-
-
-  if(faddhists)
-    {
-      if (fEstimateITSTPC) delete fEstimateITSTPC;
-      fEstimateITSTPC = new TH1D(*aCut.fEstimateITSTPC);
-
-      if (fEstimateTracklets) delete fEstimateTracklets;
-      fEstimateTracklets = new TH1D(*aCut.fEstimateTracklets);
-
-      if (fEstimateITSPure) delete fEstimateITSPure;
-      fEstimateITSPure = new TH1D(*aCut.fEstimateITSPure);
-
-      if (fEst1Est2) delete fEst1Est2;
-      fEst1Est2 = new TH2D(*aCut.fEst1Est2);
-
-      if (fEst1Est3) delete fEst1Est3;
-      fEst1Est3 = new TH2D(*aCut.fEst1Est3);
-
-      if (fEst2Est3) delete fEst2Est3;
-      fEst2Est3 = new TH2D(*aCut.fEst2Est3);
-
-      if (fEst1Norm) delete fEst1Norm;
-      fEst1Norm = new TH2D(*aCut.fEst1Norm);
-
-      if (fEst2Norm) delete fEst2Norm;
-      fEst2Norm = new TH2D(*aCut.fEst2Norm);
-
-      if (fEst3Norm) delete fEst3Norm;
-      fEst3Norm = new TH2D(*aCut.fEst3Norm);
-    }
-
-  return *this;
-}
-
-AliFemtoString AliFemtoCutMonitorEventMult::Report(){ 
-  // Prepare report from the execution
-  string stemp = "*** AliFemtoCutMonitorEventMult report"; 
-  AliFemtoString returnThis = stemp;
-  return returnThis; 
-}
-
-void AliFemtoCutMonitorEventMult::Fill(const AliFemtoEvent* aEvent)
-{
-  // Fill in the monitor histograms with the values from the current track
-  fEvMult->Fill(aEvent->NumberOfTracks());
-  fNormEvMult->Fill(aEvent->UncorrectedNumberOfPrimaries());
-  if(!freadMC){
-    fSPDMult->Fill(aEvent->SPDMultiplicity());
-  }
-  fMultSumPt->Fill(aEvent->UncorrectedNumberOfPrimaries(), aEvent->ZDCEMEnergy());
-
-  if(faddhists)
-    {
-      fEstimateITSTPC->Fill(aEvent->MultiplicityEstimateITSTPC());
-      fEstimateTracklets->Fill(aEvent->MultiplicityEstimateTracklets());
-      fEstimateITSPure->Fill(aEvent->MultiplicityEstimateITSPure());
-      fEst1Est2->Fill(aEvent->MultiplicityEstimateITSTPC(),aEvent->MultiplicityEstimateTracklets());
-      fEst1Est3->Fill(aEvent->MultiplicityEstimateITSTPC(),aEvent->MultiplicityEstimateITSPure());
-      fEst2Est3->Fill(aEvent->MultiplicityEstimateTracklets(),aEvent->MultiplicityEstimateITSPure());
-      fEst1Norm->Fill(aEvent->MultiplicityEstimateITSTPC(),aEvent->UncorrectedNumberOfPrimaries());
-      fEst2Norm->Fill(aEvent->MultiplicityEstimateTracklets(),aEvent->UncorrectedNumberOfPrimaries());
-      fEst3Norm->Fill(aEvent->MultiplicityEstimateITSPure(),aEvent->UncorrectedNumberOfPrimaries());
-    }
-
-}
-
-void AliFemtoCutMonitorEventMult::Write()
-{
-  // Write out the relevant histograms
-  fEvMult->Write();
-  fNormEvMult->Write();
-  if(!freadMC){
-    fSPDMult->Write();
-  }
-  fMultSumPt->Write();
-
-  if(faddhists)
-    {
-      fEstimateITSTPC->Write();
-      fEstimateTracklets->Write();
-      fEstimateITSPure->Write();
-      fEst1Est2->Write();
-      fEst1Est3->Write();
-      fEst2Est3->Write();
-      fEst1Norm->Write();
-      fEst2Norm->Write();
-      fEst3Norm->Write();
-    }
-
-}
-
-TList *AliFemtoCutMonitorEventMult::GetOutputList()
-{
-  TList *tOutputList = new TList();
-  tOutputList->Add(fEvMult);
-  tOutputList->Add(fNormEvMult);
-  tOutputList->Add(fSPDMult);
-  tOutputList->Add(fMultSumPt);
-
-  if(faddhists)
-    {
-      tOutputList->Add(fEstimateITSTPC);
-      tOutputList->Add(fEstimateTracklets);
-      tOutputList->Add(fEstimateITSPure);
-      tOutputList->Add(fEst1Est2);
-      tOutputList->Add(fEst1Est3);
-      tOutputList->Add(fEst2Est3);
-      tOutputList->Add(fEst1Norm);
-      tOutputList->Add(fEst2Norm);
-      tOutputList->Add(fEst3Norm);
-    }
-  
-  return tOutputList;
-}
-
-void AliFemtoCutMonitorEventMult::SetReadMC(Bool_t mc)
-{
-  freadMC=mc;
-}
-
-void AliFemtoCutMonitorEventMult::AdditionalMultHistsOn(Bool_t addhists)
-{
-  faddhists=addhists;
-}
-
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorEventMult.h b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorEventMult.h
deleted file mode 100644 (file)
index 143109d..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-///                                                                          ///
-/// AliFemtoCutMonitorEventMult - the cut monitor for events to study        ///
-/// the multiplicity distribution of events                                  ///
-///                                                                          ///
-////////////////////////////////////////////////////////////////////////////////
-#ifndef AliFemtoCutMonitorEventMult_hh
-#define AliFemtoCutMonitorEventMult_hh
-
-class AliFemtoEvent;
-class AliFemtoTrack;
-class AliFemtoV0;
-class AliFemtoKink;
-class AliFemtoPair; 
-class TH1D;
-class TH2D;
-class TList;
-#include "AliFemtoString.h"
-#include "AliFemtoParticleCollection.h"
-#include "AliFemtoCutMonitor.h"
-
-class AliFemtoCutMonitorEventMult : public AliFemtoCutMonitor{
-  
- public:
-  AliFemtoCutMonitorEventMult();
-  AliFemtoCutMonitorEventMult(const char *aName);
-  AliFemtoCutMonitorEventMult(const AliFemtoCutMonitorEventMult &aCut);
-  virtual ~AliFemtoCutMonitorEventMult();
-
-  AliFemtoCutMonitorEventMult& operator=(const AliFemtoCutMonitorEventMult& aCut);
-
-  virtual AliFemtoString Report();
-  virtual void Fill(const AliFemtoEvent* aEvent);
-  virtual void Fill(const AliFemtoTrack* aTrack) {AliFemtoCutMonitor::Fill(aTrack);}
-  virtual void Fill(const AliFemtoV0* aV0) {AliFemtoCutMonitor::Fill(aV0);}
-  virtual void Fill(const AliFemtoKink* aKink) {AliFemtoCutMonitor::Fill(aKink);}
-  virtual void Fill(const AliFemtoPair* aPair) {AliFemtoCutMonitor::Fill(aPair);}
-  virtual void Fill(const AliFemtoParticleCollection* aCollection) {AliFemtoCutMonitor::Fill(aCollection);}
-  virtual void Fill(const AliFemtoEvent* aEvent,const AliFemtoParticleCollection* aCollection)
-  {AliFemtoCutMonitor::Fill(aEvent, aCollection);}
-
-  void SetReadMC(Bool_t mc);
-  void AdditionalMultHistsOn(Bool_t addhists);
-  void Write();
-
-  virtual TList *GetOutputList();
-
- private:
-  TH1D *fEvMult;     // Multiplicity distribution
-  TH1D *fNormEvMult; // Normalized event multiplicity distribution
-  TH1D *fSPDMult;    // SPD tracklet multiplicity
-  TH2D *fMultSumPt;  // Event total pT vs. multiplicity
-
-  Bool_t freadMC;     // If true - add only one histogram to the output
-  Bool_t faddhists;   // If true - add only additional multiplicity histograms
-  
-  TH1D *fEstimateITSTPC;     // Multiplicity estimate ITS+TPC
-  TH1D *fEstimateTracklets;  // Multiplicity estimate Tracklets
-  TH1D *fEstimateITSPure;    // Multiplicity estimate ITS Pure
-
-  TH2D *fEst1Est2;           // ITS+TPC vs Tracklets
-  TH2D *fEst1Est3;           // ITS+TPC vs ITS Pure
-  TH2D *fEst2Est3;           // Tracklets vs ITS Pure
-  TH2D *fEst1Norm;           // ITS+TPC vs Normalized
-  TH2D *fEst2Norm;           // Tracklets vs Normalized
-  TH2D *fEst3Norm;           // ITS Pure vs Normalized
-
-};
-
-#endif
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorEventVertex.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorEventVertex.cxx
deleted file mode 100644 (file)
index df5b93e..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//                                                                            //
-// AliFemtoCutMonitorEventVertex - the cut monitor for events to study        //
-// the distribution and error of the primary vertex                           //
-//                                                                            //
-////////////////////////////////////////////////////////////////////////////////
-#include "AliFemtoCutMonitorEventVertex.h"
-#include "AliFemtoModelHiddenInfo.h"
-#include "AliFemtoEvent.h"
-#include <TH1D.h>
-#include <TH2D.h>
-#include <TList.h>
-#include <TMath.h>
-
-AliFemtoCutMonitorEventVertex::AliFemtoCutMonitorEventVertex():
-  AliFemtoCutMonitor(),
-  fEvVertRad(0),
-  fEvVertXY(0),
-  fEvVertSigXY(0),
-  fEvVertZ(0),
-  fEvVertSigZ(0)
-{
-  // Default constructor
-  fEvVertRad   = new TH1D("EvVertRad",   "Vertex position radial", 200, 0.0, 0.2);
-  fEvVertXY    = new TH2D("EvVertXY",    "Vertex position xy plane", 200, -0.2, 0.2, 200, -0.2, 0.2);
-  fEvVertSigXY = new TH1D("EvVertSigXY", "Vertex error in xy plane", 200, 0.0, 0.2);
-  fEvVertZ     = new TH1D("EvVertZ",     "Vertex position in z", 500, -50.0, 50.0);
-  fEvVertSigZ  = new TH1D("EvVertSigZ",  "Vertex error in z", 100, 0.0, 0.2);
-}
-
-AliFemtoCutMonitorEventVertex::AliFemtoCutMonitorEventVertex(const char *aName):
-  AliFemtoCutMonitor(),
-  fEvVertRad(0),
-  fEvVertXY(0),
-  fEvVertSigXY(0),
-  fEvVertZ(0),
-  fEvVertSigZ(0)
-{
-  // Normal constructor
-  char name[200];
-  snprintf(name, 200, "EvVertRad%s", aName);
-  fEvVertRad   = new TH1D(name,   "Vertex position radial", 200, 0.0, 0.2);
-  snprintf(name, 200, "EvVertXY%s", aName);
-  fEvVertXY    = new TH2D(name,    "Vertex position xy plane", 200, -0.2, 0.2, 200, -0.2, 0.2);
-  snprintf(name, 200, "EvVertSigXY%s", aName);
-  fEvVertSigXY = new TH1D(name, "Vertex error in xy plane", 200, 0.0, 0.2);
-  snprintf(name, 200, "EvVertZ%s", aName);
-  fEvVertZ     = new TH1D(name,     "Vertex position in z", 500, -50.0, 50.0);
-  snprintf(name, 200, "EvVertSigZ%s", aName);
-  fEvVertSigZ  = new TH1D(name,  "Vertex error in z", 100, 0.0, 0.2);
-}
-
-AliFemtoCutMonitorEventVertex::AliFemtoCutMonitorEventVertex(const AliFemtoCutMonitorEventVertex &aCut):
-  AliFemtoCutMonitor(),
-  fEvVertRad(0),
-  fEvVertXY(0),
-  fEvVertSigXY(0),
-  fEvVertZ(0),
-  fEvVertSigZ(0)
-{
-  // copy constructor
-  if (fEvVertRad) delete fEvVertRad;
-  fEvVertRad = new TH1D(*aCut.fEvVertRad);
-  if (fEvVertXY) delete fEvVertXY;
-  fEvVertXY = new TH2D(*aCut.fEvVertXY);
-  if (fEvVertSigXY) delete fEvVertSigXY;
-  fEvVertSigXY = new TH1D(*aCut.fEvVertSigXY);
-  if (fEvVertZ) delete fEvVertZ;
-  fEvVertZ = new TH1D(*aCut.fEvVertZ);
-  if (fEvVertSigZ) delete fEvVertSigZ;
-  fEvVertSigZ = new TH1D(*aCut.fEvVertSigZ);
-}
-
-AliFemtoCutMonitorEventVertex::~AliFemtoCutMonitorEventVertex()
-{
-  // Destructor
-  delete fEvVertRad;
-  delete fEvVertXY;
-  delete fEvVertSigXY;
-  delete fEvVertZ;
-  delete fEvVertSigZ;
-}
-
-AliFemtoCutMonitorEventVertex& AliFemtoCutMonitorEventVertex::operator=(const AliFemtoCutMonitorEventVertex& aCut)
-{
-  // assignment operator
-  if (this == &aCut) 
-    return *this;
-
-  if (fEvVertRad) delete fEvVertRad;
-  fEvVertRad = new TH1D(*aCut.fEvVertRad);
-  if (fEvVertXY) delete fEvVertXY;
-  fEvVertXY = new TH2D(*aCut.fEvVertXY);
-  if (fEvVertSigXY) delete fEvVertSigXY;
-  fEvVertSigXY = new TH1D(*aCut.fEvVertSigXY);
-  if (fEvVertZ) delete fEvVertZ;
-  fEvVertZ = new TH1D(*aCut.fEvVertZ);
-  if (fEvVertSigZ) delete fEvVertSigZ;
-  fEvVertSigZ = new TH1D(*aCut.fEvVertSigZ);
-  
-  return *this;
-}
-
-AliFemtoString AliFemtoCutMonitorEventVertex::Report(){ 
-  // Prepare report from the execution
-  string stemp = "*** AliFemtoCutMonitorEventVertex report"; 
-  AliFemtoString returnThis = stemp;
-  return returnThis; 
-}
-
-void AliFemtoCutMonitorEventVertex::Fill(const AliFemtoEvent* aEvent)
-{
-  // Fill in the monitor histograms with the values from the current track
-  fEvVertRad->Fill(TMath::Hypot(aEvent->PrimVertPos().x(), aEvent->PrimVertPos().y()));
-  fEvVertXY->Fill(aEvent->PrimVertPos().x(), aEvent->PrimVertPos().y());
-  fEvVertSigXY->Fill(TMath::Sqrt(aEvent->PrimVertCov()[0]+aEvent->PrimVertCov()[2]));
-  fEvVertZ->Fill(aEvent->PrimVertPos().z());
-  fEvVertSigZ->Fill(TMath::Sqrt(aEvent->PrimVertCov()[5]));
-}
-
-void AliFemtoCutMonitorEventVertex::Write()
-{
-  // Write out the relevant histograms
-  fEvVertRad->Write();
-  fEvVertXY->Write();
-  fEvVertSigXY->Write();
-  fEvVertZ->Write();
-  fEvVertSigZ->Write();
-}
-
-TList *AliFemtoCutMonitorEventVertex::GetOutputList()
-{
-  TList *tOutputList = new TList();
-  tOutputList->Add(fEvVertRad);
-  tOutputList->Add(fEvVertXY);
-  tOutputList->Add(fEvVertSigXY);
-  tOutputList->Add(fEvVertZ);
-  tOutputList->Add(fEvVertSigZ);
-
-  return tOutputList;
-}
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorEventVertex.h b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorEventVertex.h
deleted file mode 100644 (file)
index 7d0640a..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-///                                                                          ///
-/// AliFemtoCutMonitorEventVertex - the cut monitor for events to study      ///
-/// the distribution and error of the primary vertex                         ///
-///                                                                          ///
-////////////////////////////////////////////////////////////////////////////////
-#ifndef AliFemtoCutMonitorEventVertex_hh
-#define AliFemtoCutMonitorEventVertex_hh
-
-class AliFemtoEvent;
-class AliFemtoTrack;
-class AliFemtoV0;
-class AliFemtoKink;
-class AliFemtoPair; 
-class TH1D;
-class TH2D;
-class TList;
-#include "AliFemtoString.h"
-#include "AliFemtoParticleCollection.h"
-#include "AliFemtoCutMonitor.h"
-
-class AliFemtoCutMonitorEventVertex : public AliFemtoCutMonitor{
-  
-public:
-  AliFemtoCutMonitorEventVertex();
-  AliFemtoCutMonitorEventVertex(const char *aName);
-  AliFemtoCutMonitorEventVertex(const AliFemtoCutMonitorEventVertex &aCut);
-  virtual ~AliFemtoCutMonitorEventVertex();
-
-  AliFemtoCutMonitorEventVertex& operator=(const AliFemtoCutMonitorEventVertex& aCut);
-
-  virtual AliFemtoString Report();
-  virtual void Fill(const AliFemtoEvent* aEvent);
-  virtual void Fill(const AliFemtoTrack* aTrack) {AliFemtoCutMonitor::Fill(aTrack);}
-  virtual void Fill(const AliFemtoV0* aV0) {AliFemtoCutMonitor::Fill(aV0);}
-  virtual void Fill(const AliFemtoKink* aKink) {AliFemtoCutMonitor::Fill(aKink);}
-  virtual void Fill(const AliFemtoPair* aPair) {AliFemtoCutMonitor::Fill(aPair);}
-  virtual void Fill(const AliFemtoParticleCollection* aCollection) {AliFemtoCutMonitor::Fill(aCollection);}
-  virtual void Fill(const AliFemtoEvent* aEvent,const AliFemtoParticleCollection* aCollection)
-  {AliFemtoCutMonitor::Fill(aEvent, aCollection);}
-
-  void Write();
-
-  virtual TList *GetOutputList();
-
-private:
-  TH1D *fEvVertRad;     // Vertex position in radial direction
-  TH2D *fEvVertXY;      // Vertex position in XY plane
-  TH1D *fEvVertSigXY;   // Sigma in XY plane
-  TH1D *fEvVertZ;       // Vertex position in Z direction
-  TH1D *fEvVertSigZ;    // Sigma in Z direction
-};
-
-#endif
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorHandler.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorHandler.cxx
deleted file mode 100644 (file)
index efdb4b7..0000000
+++ /dev/null
@@ -1,318 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// AliFemtoCutMonitorHandler: a handler for cut monitors                 //
-// You add cut monitors to the collection which are stored in two        //
-// separate collections - one which stores characteristics of the        //
-// entities (tracks, particles, pairs, events) that pass the respective  //
-// cuts and the other for the ones that fail the cut.                    //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-#include <TList.h>
-#include "AliFemtoCutMonitorHandler.h"
-#include "AliFemtoTypes.h"
-
-#ifdef __ROOT__
-ClassImp(AliFemtoCutMonitorHandler)
-#endif
-// ---------------------------------------------------------------------------
-AliFemtoCutMonitorHandler::AliFemtoCutMonitorHandler():
-  fCollectionsEmpty(0), fPassColl(0), fFailColl(0)
-{
-  // Default constructor
-  cout << " *** AliFemtoCutMonitorHandler::AliFemtoCutMonitorHandler() " << endl;
-  fCollectionsEmpty = 0;
-  fPassColl = new AliFemtoCutMonitorCollection();
-  fFailColl = new AliFemtoCutMonitorCollection();
-}
-// ---------------------------------------------------------------------------
-AliFemtoCutMonitorHandler::AliFemtoCutMonitorHandler(const AliFemtoCutMonitorHandler& aHan):
-  fCollectionsEmpty(0), fPassColl(0), fFailColl(0)
-{
-  // Copy constructor
-  fCollectionsEmpty = aHan.fCollectionsEmpty;
-  fPassColl = new AliFemtoCutMonitorCollection();
-  AliFemtoCutMonitorIterator iter;
-  for (iter=aHan.fPassColl->begin(); iter!=aHan.fPassColl->end(); iter++){
-    fPassColl->push_back(*iter);
-  }
-  fFailColl = new AliFemtoCutMonitorCollection();
-  for (iter=aHan.fFailColl->begin(); iter!=aHan.fFailColl->end(); iter++){
-    fFailColl->push_back(*iter);
-  }
-}
-
-// ---------------------------------------------------------------------------
-AliFemtoCutMonitorHandler::~AliFemtoCutMonitorHandler() { 
-  // Default destructor
-  delete fPassColl;
-  delete fFailColl;
-}   
-//__________________________
-AliFemtoCutMonitorHandler& AliFemtoCutMonitorHandler::operator=(const AliFemtoCutMonitorHandler& aHan)
-{
-  // assignment operator
-  if (this == &aHan)
-    return *this;
-
-  AliFemtoCutMonitorIterator iter;
-  if (fPassColl) {
-    fPassColl->clear();
-    delete fPassColl;
-  }
-  if (fFailColl) {
-    fFailColl->clear();
-    delete fFailColl;
-  }
-  fPassColl = new AliFemtoCutMonitorCollection();
-  for (iter=aHan.fPassColl->begin(); iter!=aHan.fPassColl->end(); iter++){
-    fPassColl->push_back(*iter);
-  }
-  fFailColl = new AliFemtoCutMonitorCollection();
-  for (iter=aHan.fFailColl->begin(); iter!=aHan.fFailColl->end(); iter++){
-    fFailColl->push_back(*iter);
-  }
-  return *this;
-}
-
-// ---------------------------------------------------------------------------
-void AliFemtoCutMonitorHandler::FillCutMonitor(const AliFemtoEvent* event, bool pass) { 
-  // fill event cut monitors
-  if (fCollectionsEmpty) return;
-  AliFemtoCutMonitorIterator iter;
-  AliFemtoCutMonitor* tCM;
-  if ( pass) {
-    for (iter=fPassColl->begin(); iter!=fPassColl->end(); iter++){
-      tCM = *iter;
-      tCM->Fill(event);
-    }
-  } else {
-    for (iter=fFailColl->begin(); iter!=fFailColl->end(); iter++){
-      tCM = *iter;
-      tCM->Fill(event);
-    }
-  }
-}
-// ---------------------------------------------------------------------------
-void AliFemtoCutMonitorHandler::FillCutMonitor(const AliFemtoTrack* track, bool pass) { 
-  // Fill track cut monitors
-  if (fCollectionsEmpty) return;
-  AliFemtoCutMonitorIterator iter;
-  AliFemtoCutMonitor* tCM;
-  if ( pass) {
-    for (iter=fPassColl->begin(); iter!=fPassColl->end(); iter++){
-      tCM = *iter;
-      tCM->Fill(track);
-    }
-  } else {
-    for (iter=fFailColl->begin(); iter!=fFailColl->end(); iter++){
-      tCM = *iter;
-      tCM->Fill(track);
-    }
-  }
-}
-// ---------------------------------------------------------------------------
-void AliFemtoCutMonitorHandler::FillCutMonitor(const AliFemtoV0* v0, bool pass) { 
-  // fill V0 cut monitors
-  if (fCollectionsEmpty) return;
-  AliFemtoCutMonitorIterator iter;
-  AliFemtoCutMonitor* tCM;
-  if ( pass) {
-    for (iter=fPassColl->begin(); iter!=fPassColl->end(); iter++){
-      tCM = *iter;
-      tCM->Fill(v0);
-    }
-  } else {
-    for (iter=fFailColl->begin(); iter!=fFailColl->end(); iter++){
-      tCM = *iter;
-      tCM->Fill(v0);
-    }
-  }
-}
-// ---------------------------------------------------------------------------
-void AliFemtoCutMonitorHandler::FillCutMonitor(const AliFemtoKink* kink, bool pass) { 
-  // fill kink cut monitors
-  if (fCollectionsEmpty) return;
-  AliFemtoCutMonitorIterator iter;
-  AliFemtoCutMonitor* tCM;
-  if ( pass) {
-    for (iter=fPassColl->begin(); iter!=fPassColl->end(); iter++){
-      tCM = *iter;
-      tCM->Fill(kink);
-    }
-  } else {
-    for (iter=fFailColl->begin(); iter!=fFailColl->end(); iter++){
-      tCM = *iter;
-      tCM->Fill(kink);
-    }
-  }
-}
-// ---------------------------------Gael/12/04/02-----------------------------
-void AliFemtoCutMonitorHandler::FillCutMonitor(const AliFemtoPair* pair, bool pass) { 
-  // fill pair cut monitors
-  if (fCollectionsEmpty) return;
-  AliFemtoCutMonitorIterator iter;
-  AliFemtoCutMonitor* tCM;
-  if ( pass) {
-    for (iter=fPassColl->begin(); iter!=fPassColl->end(); iter++){
-      tCM = *iter;
-      tCM->Fill(pair);
-    }
-  } else {
-    for (iter=fFailColl->begin(); iter!=fFailColl->end(); iter++){
-      tCM = *iter;
-      tCM->Fill(pair);
-    }
-  }
-}
-// ---------------------------------Gael/19/06/02-----------------------------
-void AliFemtoCutMonitorHandler::FillCutMonitor(const AliFemtoParticleCollection* partColl) {
-  // fill particle collection cut monitor 
-  if (fCollectionsEmpty) return;
-  AliFemtoCutMonitorIterator iter;
-  AliFemtoCutMonitor* tCM;
-  
-  for (iter=fPassColl->begin(); iter!=fPassColl->end(); iter++){
-    tCM = *iter;
-    tCM->Fill(partColl);
-  }
-}
-// ------------------------------------Gael/19/06/02-------------------------
-void AliFemtoCutMonitorHandler::FillCutMonitor(const AliFemtoEvent* event,const AliFemtoParticleCollection* partColl) {
-  // Fill event particle collection
-  cout<<"In AliFemtoCutMonitorHandler::FillCutMonitor(const AliFemtoEvent* event, AliFemtoPicoEvent* picoEvent)"<<endl;
-  if (fCollectionsEmpty) return;
-  AliFemtoCutMonitorIterator iter;
-  AliFemtoCutMonitor* tCM;
-  
-  for (iter=fPassColl->begin(); iter!=fPassColl->end(); iter++){
-    tCM = *iter;
-    tCM->Fill(event,partColl);
-  }
-}
-// ---------------------------------------------------------------------------
-void AliFemtoCutMonitorHandler::Finish() { 
-  // Perform finish operations on cut monitors
-  AliFemtoCutMonitorIterator iter;
-  for (iter=fPassColl->begin(); iter!=fPassColl->end(); iter++){
-    (*iter)->Finish();
-  }
-  for (iter=fFailColl->begin(); iter!=fFailColl->end(); iter++){
-    (*iter)->Finish();
-  }
-}
-// ---------------------------------------------------------------------------
-void AliFemtoCutMonitorHandler::AddCutMonitor(AliFemtoCutMonitor* cutMoni1, AliFemtoCutMonitor* cutMoni2) { 
-  // Add cut monitors to collections
-  fPassColl->push_back(cutMoni1);
-  fFailColl->push_back(cutMoni2);
-  fCollectionsEmpty=false;
-}
-// ---------------------------------------------------------------------------
-void AliFemtoCutMonitorHandler::AddCutMonitor(AliFemtoCutMonitor* cutMoni) { 
-  // make a copy of the cut monitor
-  cout << " make a copy of the cutmonitor and push both into the collections " << endl;
-  cout << " not yet implemented" << endl;
-  fPassColl->push_back(cutMoni);
-  cout << " only pass collection pushed" << endl;
-  fCollectionsEmpty=false;
-}
-// ---------------------------------------------------------------------------
-void AliFemtoCutMonitorHandler::AddCutMonitorPass(AliFemtoCutMonitor* cutMoni) { 
-  // add monitors to pass
-  fPassColl->push_back(cutMoni);
-  fCollectionsEmpty=false;
-}
-// ---------------------------------------------------------------------------
-void AliFemtoCutMonitorHandler::AddCutMonitorFail(AliFemtoCutMonitor* cutMoni) { 
-  // add monitors to fail
-  fFailColl->push_back(cutMoni);
-  fCollectionsEmpty=false;
-}
-// ---------------------------------------------------------------------------
-AliFemtoCutMonitor* AliFemtoCutMonitorHandler::PassMonitor(int n) { 
-  // return pass monitor number n
-  AliFemtoCutMonitorIterator iter = fPassColl->begin();
-  if ( (int)fPassColl->size() <= n ) return NULL;
-  for ( int i=0; i<n; i++)
-    iter++;
-  return *iter;
-}
-// ---------------------------------------------------------------------------
-AliFemtoCutMonitor* AliFemtoCutMonitorHandler::FailMonitor(int n) { 
-  // return fail monitor number n
-  AliFemtoCutMonitorIterator iter = fFailColl->begin();
-  if ( (int)fFailColl->size() <= n ) return NULL;
-  for ( int i=0; i<n; i++)
-    iter++;
-  return *iter;
-}
-//_____________________________________________________________________________
-TList *AliFemtoCutMonitorHandler::GetOutputList()
-{
-  TList *tOutputList = new TList();
-
-  for (unsigned int ipass=0; ipass<fPassColl->size(); ipass++) {
-    TList *tLp = PassMonitor(ipass)->GetOutputList();
-
-    TIter nextLp(tLp);
-    while (TObject *obj = nextLp()) {
-      tOutputList->Add(obj);
-    }
-    
-    delete tLp;
-  }
-
-  for (unsigned int ipass=0; ipass<fFailColl->size(); ipass++) {
-    TList *tLf = FailMonitor(ipass)->GetOutputList();
-
-    TIter nextLf(tLf);
-    while (TObject *obj = nextLf()) {
-      tOutputList->Add(obj);
-    }
-    
-    delete tLf;
-  }
-
-  return tOutputList;
-}
-//_____________________________________________________________________________
-void AliFemtoCutMonitorHandler::EventBegin(const AliFemtoEvent* aEvent) 
-{ 
-  if (fCollectionsEmpty) return;
-
-  AliFemtoCutMonitorIterator iter;
-  AliFemtoCutMonitor* tCM;
-
-  for (iter=fPassColl->begin(); iter!=fPassColl->end(); iter++){
-    tCM = *iter;
-    tCM->EventBegin(aEvent);
-  }
-  
-  for (iter=fFailColl->begin(); iter!=fFailColl->end(); iter++){
-    tCM = *iter;
-    tCM->EventBegin(aEvent);
-  }
-}
-//_____________________________________________________________________________
-void AliFemtoCutMonitorHandler::EventEnd(const AliFemtoEvent* aEvent) 
-{ 
-  if (fCollectionsEmpty) return;
-
-  AliFemtoCutMonitorIterator iter;
-  AliFemtoCutMonitor* tCM;
-
-  for (iter=fPassColl->begin(); iter!=fPassColl->end(); iter++){
-    tCM = *iter;
-    tCM->EventEnd(aEvent);
-  }
-  
-  for (iter=fFailColl->begin(); iter!=fFailColl->end(); iter++){
-    tCM = *iter;
-    tCM->EventEnd(aEvent);
-  }
-}
-
-
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorHandler.h b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorHandler.h
deleted file mode 100644 (file)
index 78d912b..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// AliFemtoCutMonitorHandler: a handler for cut monitors                 //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-#ifndef AliFemtoCutMonitorHandler_hh
-#define AliFemtoCutMonitorHandler_hh
-
-
-#include "AliFemtoTypes.h"
-#include "AliFemtoEvent.h"
-#include "AliFemtoTrack.h"
-#include "AliFemtoV0.h"
-#include "AliFemtoKink.h"
-#include "AliFemtoPair.h" //Gael 12/04/02
-#include "AliFemtoParticleCollection.h" // Gael 19/06/02
-#include "AliFemtoCutMonitorCollection.h"
-#include "AliFemtoCutMonitor.h"
-
-class AliFemtoCutMonitorHandler{
-  
- public:
-  
-  AliFemtoCutMonitorHandler();
-  AliFemtoCutMonitorHandler(const AliFemtoCutMonitorHandler& aHan);
-  virtual ~AliFemtoCutMonitorHandler();
-  AliFemtoCutMonitorHandler& operator=(const AliFemtoCutMonitorHandler& aHan);
-
-  AliFemtoCutMonitorCollection* PassMonitorColl(); 
-  AliFemtoCutMonitorCollection* FailMonitorColl(); 
-  AliFemtoCutMonitor* PassMonitor(int n); 
-  AliFemtoCutMonitor* FailMonitor(int n); 
-  void AddCutMonitor(AliFemtoCutMonitor* cutMoni1, AliFemtoCutMonitor* cutMoni2); 
-  void AddCutMonitor(AliFemtoCutMonitor* cutMoni); 
-  void AddCutMonitorPass(AliFemtoCutMonitor* cutMoni); 
-  void AddCutMonitorFail(AliFemtoCutMonitor* cutMoni); 
-  void FillCutMonitor(const AliFemtoEvent* event, bool pass); 
-  void FillCutMonitor(const AliFemtoTrack* track, bool pass); 
-  void FillCutMonitor(const AliFemtoV0* v0, bool pass); 
-  void FillCutMonitor(const AliFemtoKink* kink, bool pass);
-  void FillCutMonitor(const AliFemtoPair* pair, bool pass);//Gael 11/04/02
-  void FillCutMonitor(const AliFemtoParticleCollection* partColl);// Gael 19/06/02
-  void FillCutMonitor(const AliFemtoEvent* event, const AliFemtoParticleCollection* partColl);// Gael 19/06/02
-  void Finish();
-
-  virtual TList *GetOutputList();
-
-  virtual void EventBegin(const AliFemtoEvent* aEvent);
-  virtual void EventEnd(const AliFemtoEvent* aEvent);
-  
- private:
-  bool fCollectionsEmpty;                  // Are the collections empty?
-  AliFemtoCutMonitorCollection* fPassColl; // Collection of cut monitors for passed entities
-  AliFemtoCutMonitorCollection* fFailColl; // Collection of cut monitors for failed entities
-#ifdef __ROOT__  
-  ClassDef(AliFemtoCutMonitorHandler, 0)
-#endif  
-  
-};
-
-inline AliFemtoCutMonitorCollection* AliFemtoCutMonitorHandler::PassMonitorColl() { return fPassColl;}
-inline AliFemtoCutMonitorCollection* AliFemtoCutMonitorHandler::FailMonitorColl() { return fFailColl;}
-
-#endif
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticlePID.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticlePID.cxx
deleted file mode 100644 (file)
index f225bcd..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//                                                                            //
-// AliFemtoCutMonitorParticlePID - the cut monitor for particles to study     //
-// various aspects of the PID determination                                   //
-//                                                                            //
-////////////////////////////////////////////////////////////////////////////////
-#include "AliFemtoCutMonitorParticlePID.h"
-#include "AliFemtoModelHiddenInfo.h"
-#include <TH1D.h>
-#include <TH2D.h>
-#include <TList.h>
-#include <TMath.h>
-
-AliFemtoCutMonitorParticlePID::AliFemtoCutMonitorParticlePID():
-  fTPCdEdx(0),
-  fTOFParticle(0),
-  fTOFTime(0x0),
-  ftofHist(0)
-{
-  // Default constructor
-  fTPCdEdx =  new TH2D("TPCdEdx", "TPC dEdx vs. momentum", 200, 0.1, 4.0, 250, 0.0, 500.0);
-  fTOFTime = new TH2D("TOFTime", "TOF Time vs. momentum", 190, 0.1, 2.0, 400, -4000.0, 4000.0);
-  ftofHist=new TH2D("TOFHist","TOF momentum vs v",100,0.,1.1,100,0.,3.0);
-}
-
-AliFemtoCutMonitorParticlePID::AliFemtoCutMonitorParticlePID(const char *aName, Int_t aTOFParticle):
-  AliFemtoCutMonitor(),
-  fTPCdEdx(0),
-  fTOFParticle(aTOFParticle),
-  fTOFTime(0x0),
-  ftofHist(0)
-{
-  // Normal constructor
-  char name[200];
-  snprintf(name, 200, "TPCdEdx%s", aName);
-  fTPCdEdx = new TH2D(name, "TPC dEdx vs. momentum", 200, 0.1, 4.0, 250, 0.0, 500.0);
-
-  snprintf(name, 200, "TOFTime%s", aName);
-  fTOFTime = new TH2D(name, "TOF Time vs. momentum", 190, 0.1, 2.0, 400, -4000.0, 4000.0);
-
-  snprintf(name, 200, "TOFHist%s", aName);
-  ftofHist=new TH2D(name,"TOF momentum vs v",100,0.,1.1,100,0.,3.0);
-}
-
-AliFemtoCutMonitorParticlePID::AliFemtoCutMonitorParticlePID(const AliFemtoCutMonitorParticlePID &aCut):
-  AliFemtoCutMonitor(),
-  fTPCdEdx(0),
-  fTOFParticle(0),
-  fTOFTime(0x0),
-  ftofHist(0)
-{
-  // copy constructor
-  if (fTPCdEdx) delete fTPCdEdx;
-  fTPCdEdx = new TH2D(*aCut.fTPCdEdx);
-
-  if (fTOFTime) delete fTOFTime;
-  fTOFTime = new TH2D(*aCut.fTOFTime);
-
-  if (ftofHist) delete ftofHist; 
-  ftofHist= new TH2D(*aCut.ftofHist);
-}
-
-AliFemtoCutMonitorParticlePID::~AliFemtoCutMonitorParticlePID()
-{
-  // Destructor
-  delete fTPCdEdx;
-  delete fTOFTime;
-  delete ftofHist;
-}
-
-AliFemtoCutMonitorParticlePID& AliFemtoCutMonitorParticlePID::operator=(const AliFemtoCutMonitorParticlePID& aCut)
-{
-  // assignment operator
-  if (this == &aCut) 
-    return *this;
-
-  if (fTPCdEdx) delete fTPCdEdx;
-  fTPCdEdx = new TH2D(*aCut.fTPCdEdx);
-
-  if (fTOFTime) delete fTOFTime;
-  fTOFTime = new TH2D(*aCut.fTOFTime);
-  
-  if(ftofHist) delete ftofHist;
-  ftofHist = new TH2D(*aCut.ftofHist);
-  return *this;
-}
-
-AliFemtoString AliFemtoCutMonitorParticlePID::Report(){ 
-  // Prepare report from the execution
-  string stemp = "*** AliFemtoCutMonitorParticlePID report"; 
-  AliFemtoString returnThis = stemp;
-  return returnThis; 
-}
-
-void AliFemtoCutMonitorParticlePID::Fill(const AliFemtoTrack* aTrack)
-{
-  // Fill in the monitor histograms with the values from the current track
-  float tMom = aTrack->P().Mag();
-  float tdEdx = aTrack->TPCsignal();
-  float tTOF = 0.0;
-  //  short tchg = aTrack->Charge();
-  if (fTOFParticle == 0) tTOF = aTrack->TOFpionTime();
-  if (fTOFParticle == 1) tTOF = aTrack->TOFkaonTime();
-  if (fTOFParticle == 2) tTOF = aTrack->TOFprotonTime();
-
-  fTPCdEdx->Fill(tMom, tdEdx);
-  fTOFTime->Fill(tMom, tTOF);
-
-  float vp= aTrack->VTOF();
-  ftofHist->Fill(vp,tMom);
-}
-
-void AliFemtoCutMonitorParticlePID::Write()
-{
-  // Write out the relevant histograms
-  fTPCdEdx->Write();
-  fTOFTime->Write();
-  ftofHist->Write();
-}
-
-TList *AliFemtoCutMonitorParticlePID::GetOutputList()
-{
-  TList *tOutputList = new TList();
-  tOutputList->Add(fTPCdEdx);
-  tOutputList->Add(fTOFTime);
-  tOutputList->Add(ftofHist);
-  return tOutputList;
-}
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticlePID.h b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticlePID.h
deleted file mode 100644 (file)
index 920de21..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-///                                                                          ///
-/// AliFemtoCutMonitorParticlePID - the cut monitor for particles to study   ///
-/// various aspects of the PID determination                                 ///
-///                                                                          ///
-////////////////////////////////////////////////////////////////////////////////
-#ifndef AliFemtoCutMonitorParticlePID_hh
-#define AliFemtoCutMonitorParticlePID_hh
-
-class AliFemtoEvent;
-class AliFemtoTrack;
-class AliFemtoV0;
-class AliFemtoKink;
-class AliFemtoPair; // Gael 12/04/02
-class TH1D;
-class TH2D;
-class TList;
-#include "AliFemtoString.h"
-#include "AliFemtoParticleCollection.h"
-#include "AliFemtoCutMonitor.h"
-
-class AliFemtoCutMonitorParticlePID : public AliFemtoCutMonitor{
-  
-public:
-  AliFemtoCutMonitorParticlePID();
-  AliFemtoCutMonitorParticlePID(const char *aName, Int_t aTOFParticle);
-  AliFemtoCutMonitorParticlePID(const AliFemtoCutMonitorParticlePID &aCut);
-  virtual ~AliFemtoCutMonitorParticlePID();
-
-  AliFemtoCutMonitorParticlePID& operator=(const AliFemtoCutMonitorParticlePID& aCut);
-
-  virtual AliFemtoString Report();
-  virtual void Fill(const AliFemtoEvent* aEvent) {AliFemtoCutMonitor::Fill(aEvent);}
-  virtual void Fill(const AliFemtoTrack* aTrack);
-  virtual void Fill(const AliFemtoV0* aV0) {AliFemtoCutMonitor::Fill(aV0);}
-  virtual void Fill(const AliFemtoKink* aKink) {AliFemtoCutMonitor::Fill(aKink);}
-  virtual void Fill(const AliFemtoPair* aPair) {AliFemtoCutMonitor::Fill(aPair);}
-  virtual void Fill(const AliFemtoParticleCollection* aCollection) {AliFemtoCutMonitor::Fill(aCollection);}
-  virtual void Fill(const AliFemtoEvent* aEvent,const AliFemtoParticleCollection* aCollection)
-  {AliFemtoCutMonitor::Fill(aEvent, aCollection);}
-
-  void SetTOFParticle(Int_t ipart);
-
-  void Write();
-
-  virtual TList *GetOutputList();
-
-private:
-  TH2D *fTPCdEdx;     // TPC dEdx information
-  Int_t fTOFParticle; // Select TOF time hypothesis, 0-pion, 1-kaon, 2-proton
-  TH2D *fTOFTime;     // TOF time
-  TH2D* ftofHist;     // TOF hist with vp
-
-};
-
-#endif
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticleVertPos.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticleVertPos.cxx
deleted file mode 100644 (file)
index f752c15..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//                                                                            //
-// AliFemtoCutMonitorParticleVertPos - the cut monitor for particles to study    //
-// the difference between reconstructed and true momentum                     //
-//                                                                            //
-////////////////////////////////////////////////////////////////////////////////
-#include "AliFemtoCutMonitorParticleVertPos.h"
-#include "AliFemtoModelHiddenInfo.h"
-#include "AliFemtoModelGlobalHiddenInfo.h"
-#include <TH1D.h>
-#include <TH2D.h>
-#include <TList.h>
-#include <TMath.h>
-
-AliFemtoCutMonitorParticleVertPos::AliFemtoCutMonitorParticleVertPos():
-  fVertPos(0),
-  fEtaZ(0),
-  fRadPos(0),
-  fEmPointX(0),
-  fEmPointY(0),
-  fEmPointZ(0),
-  fEmPointT(0)
-{
-  // Default constructor
-  fVertPos = new TH2D("VertPos", "Vertex position", 200, -20.0, 20.0, 200, -20.0, 20.0);
-  fEtaZ    = new TH2D("EtaZPos", "Z vs. Eta", 200, -100.0, 100.0, 100, -1.5, 1.5);
-  fRadPos  = new TH1D("RadPos",  "Radial position", 200, 0.0, 1.0);
-  fEmPointX = new TH1D("EmPointX","Emission point x", 400, -200.0, 200.0);
-  fEmPointY = new TH1D("EmPointY","Emission point y", 400, -200.0, 200.0);
-  fEmPointZ = new TH1D("EmPointZ","Emission point z", 400, -200.0, 200.0);
-  fEmPointT = new TH1D("EmPointT","Emission point t", 400, -200.0, 200.0);
-
-}
-
-AliFemtoCutMonitorParticleVertPos::AliFemtoCutMonitorParticleVertPos(const char *aName):
-  AliFemtoCutMonitor(),
-  fVertPos(0),
-  fEtaZ(0),
-  fRadPos(0),
-  fEmPointX(0),
-  fEmPointY(0),
-  fEmPointZ(0),
-  fEmPointT(0)
-{
-  // Normal constructor
-  char name[200];
-  snprintf(name, 200, "VertPos%s", aName);
-  fVertPos = new TH2D(name, "Rapdity vs Pt", 200, -20.0, 20.0, 200, -20.0, 20.0);
-  snprintf(name, 200, "EtaZPos%s", aName);
-  fEtaZ    = new TH2D(name, "Z vs. Eta", 200, -100.0, 100.0, 100, -1.5, 1.5);
-  snprintf(name, 200, "RadPos%s", aName);
-  fRadPos  = new TH1D(name,  "Radial position", 200, 0.0, 1.0);
-  snprintf(name, 200, "EmPosX%s", aName);
-  fEmPointX = new TH1D(name,"Emission point x", 400, -200.0, 200.0);
-  snprintf(name, 200, "EmPosY%s", aName);
-  fEmPointY = new TH1D(name,"Emission point y", 400, -200.0, 200.0);
-  snprintf(name, 200, "EmPosZ%s", aName);
-  fEmPointZ = new TH1D(name,"Emission point z", 400, -200.0, 200.0);
-  snprintf(name, 200, "EmPosT%s", aName);
-  fEmPointT = new TH1D(name,"Emission point t", 400, -200.0, 200.0);
-}
-
-AliFemtoCutMonitorParticleVertPos::AliFemtoCutMonitorParticleVertPos(const AliFemtoCutMonitorParticleVertPos &aCut):
-  AliFemtoCutMonitor(),
-  fVertPos(0),
-  fEtaZ(0),
-  fRadPos(0),
-  fEmPointX(0),
-  fEmPointY(0),
-  fEmPointZ(0),
-  fEmPointT(0)
-{
-  // copy constructor
-  if (fVertPos) delete fVertPos;
-  fVertPos = new TH2D(*aCut.fVertPos);
-  if (fEtaZ) delete fEtaZ;
-  fEtaZ = new TH2D(*aCut.fEtaZ);
-  if (fRadPos) delete fRadPos;
-  fRadPos = new TH1D(*aCut.fRadPos);
-  if (fEmPointX) delete fEmPointX;
-  fEmPointX = new TH1D(*aCut.fEmPointX);
-  if (fEmPointY) delete fEmPointY;
-  fEmPointY = new TH1D(*aCut.fEmPointY);
-  if (fEmPointZ) delete fEmPointZ;
-  fEmPointZ = new TH1D(*aCut.fEmPointZ);
-  if (fEmPointT) delete fEmPointT;
-  fEmPointT = new TH1D(*aCut.fEmPointT);
-}
-
-AliFemtoCutMonitorParticleVertPos::~AliFemtoCutMonitorParticleVertPos()
-{
-  // Destructor
-  delete fVertPos;
-  delete fEtaZ;
-  delete fRadPos;
-  delete fEmPointX;
-  delete fEmPointY;
-  delete fEmPointZ;
-  delete fEmPointT;
-}
-
-AliFemtoCutMonitorParticleVertPos& AliFemtoCutMonitorParticleVertPos::operator=(const AliFemtoCutMonitorParticleVertPos& aCut)
-{
-  // assignment operator
-  if (this == &aCut) 
-    return *this;
-
-  if (fVertPos) delete fVertPos;
-  fVertPos = new TH2D(*aCut.fVertPos);
-  if (fEtaZ) delete fEtaZ;
-  fEtaZ = new TH2D(*aCut.fEtaZ);
-  if (fRadPos) delete fRadPos;
-  fRadPos = new TH1D(*aCut.fRadPos);
-  if (fEmPointX) delete fEmPointX;
-  fEmPointX = new TH1D(*aCut.fEmPointX);
-  if (fEmPointY) delete fEmPointY;
-  fEmPointY = new TH1D(*aCut.fEmPointY);
-  if (fEmPointZ) delete fEmPointZ;
-  fEmPointZ = new TH1D(*aCut.fEmPointZ);
-  if (fEmPointT) delete fEmPointT;
-  fEmPointT = new TH1D(*aCut.fEmPointT);
-  
-  return *this;
-}
-
-AliFemtoString AliFemtoCutMonitorParticleVertPos::Report(){ 
-  // Prepare report from the execution
-  string stemp = "*** AliFemtoCutMonitorParticleVertPos report"; 
-  AliFemtoString returnThis = stemp;
-  return returnThis; 
-}
-
-void AliFemtoCutMonitorParticleVertPos::Fill(const AliFemtoTrack* aTrack)
-{
-  // Fill in the monitor histograms with the values from the current track
-  AliFemtoModelGlobalHiddenInfo *hinfo = dynamic_cast<AliFemtoModelGlobalHiddenInfo *>(aTrack->GetHiddenInfo());
-  if (hinfo) {
-    float tEta = -TMath::Log(TMath::Tan(hinfo->GetTrueMomentum()->Theta()/2.0));
-
-    fVertPos->Fill(hinfo->GetGlobalEmissionPoint()->x(), hinfo->GetGlobalEmissionPoint()->y());
-    fEtaZ->Fill(hinfo->GetGlobalEmissionPoint()->z(), tEta);
-    fRadPos->Fill(hinfo->GetGlobalEmissionPoint()->Perp());
-  }
-  
-  AliFemtoModelHiddenInfo *hminfo = dynamic_cast<AliFemtoModelHiddenInfo *>(aTrack->GetHiddenInfo());
-  if (hminfo) {
-    fEmPointX->Fill(hminfo->GetEmissionPoint()->x());
-    fEmPointY->Fill(hminfo->GetEmissionPoint()->y());
-    fEmPointZ->Fill(hminfo->GetEmissionPoint()->z());
-    fEmPointT->Fill(hminfo->GetEmissionPoint()->t());
-  }
-}
-
-void AliFemtoCutMonitorParticleVertPos::Write()
-{
-  // Write out the relevant histograms
-  fVertPos->Write();
-  fEtaZ->Write();
-  fRadPos->Write();
-  fEmPointX->Write();
-  fEmPointY->Write();
-  fEmPointZ->Write();
-  fEmPointT->Write();
-}
-
-TList *AliFemtoCutMonitorParticleVertPos::GetOutputList()
-{
-  TList *tOutputList = new TList();
-  tOutputList->Add(fVertPos);
-  tOutputList->Add(fEtaZ);
-  tOutputList->Add(fRadPos);
-  tOutputList->Add(fEmPointX);
-  tOutputList->Add(fEmPointY);
-  tOutputList->Add(fEmPointZ);
-  tOutputList->Add(fEmPointT);
-
-  return tOutputList;
-}
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticleVertPos.h b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticleVertPos.h
deleted file mode 100644 (file)
index 806a427..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-///                                                                          ///
-/// AliFemtoCutMonitorParticleVertPos - the cut monitor for particles to study  ///
-/// the difference between reconstructed and true momentum    ///
-///                                                                          ///
-////////////////////////////////////////////////////////////////////////////////
-#ifndef AliFemtoCutMonitorParticleVertPos_hh
-#define AliFemtoCutMonitorParticleVertPos_hh
-
-class AliFemtoEvent;
-class AliFemtoTrack;
-class AliFemtoV0;
-class AliFemtoKink;
-class AliFemtoPair; // Gael 12/04/02
-class TH1D;
-class TH2D;
-class TList;
-#include "AliFemtoString.h"
-#include "AliFemtoParticleCollection.h"
-#include "AliFemtoCutMonitor.h"
-
-class AliFemtoCutMonitorParticleVertPos : public AliFemtoCutMonitor{
-  
-public:
-  AliFemtoCutMonitorParticleVertPos();
-  AliFemtoCutMonitorParticleVertPos(const char *aName);
-  AliFemtoCutMonitorParticleVertPos(const AliFemtoCutMonitorParticleVertPos &aCut);
-  virtual ~AliFemtoCutMonitorParticleVertPos();
-
-  AliFemtoCutMonitorParticleVertPos& operator=(const AliFemtoCutMonitorParticleVertPos& aCut);
-
-  virtual AliFemtoString Report();
-  virtual void Fill(const AliFemtoEvent* aEvent) {AliFemtoCutMonitor::Fill(aEvent);}
-  virtual void Fill(const AliFemtoTrack* aTrack);
-  virtual void Fill(const AliFemtoV0* aV0) {AliFemtoCutMonitor::Fill(aV0);}
-  virtual void Fill(const AliFemtoKink* aKink) {AliFemtoCutMonitor::Fill(aKink);}
-  virtual void Fill(const AliFemtoPair* aPair) {AliFemtoCutMonitor::Fill(aPair);}
-  virtual void Fill(const AliFemtoParticleCollection* aCollection) {AliFemtoCutMonitor::Fill(aCollection);}
-  virtual void Fill(const AliFemtoEvent* aEvent,const AliFemtoParticleCollection* aCollection)
-  {AliFemtoCutMonitor::Fill(aEvent, aCollection);}
-
-
-  void Write();
-
-  virtual TList *GetOutputList();
-
-private:
-  TH2D *fVertPos;    // Vertex position x vs. y monitor
-  TH2D *fEtaZ;       // Vertex z position vs. eta monitor
-  TH1D *fRadPos;     // Radial position close to vertex
-  TH1D *fEmPointX;   // Emission point - x
-  TH1D *fEmPointY;   // Emission point - y
-  TH1D *fEmPointZ;   // Emission point - z
-  TH1D *fEmPointT;   // Emission point - t
-  
-};
-
-#endif
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticleYPt.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticleYPt.cxx
deleted file mode 100644 (file)
index a844d51..0000000
+++ /dev/null
@@ -1,206 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//                                                                            //
-// AliFemtoCutMonitorParticleYPt - the cut monitor for particles to study    //
-// the difference between reconstructed and true momentum                     //
-//                                                                            //
-////////////////////////////////////////////////////////////////////////////////
-#include "AliFemtoCutMonitorParticleYPt.h"
-#include "AliFemtoModelHiddenInfo.h"
-#include <TH1D.h>
-#include <TH2D.h>
-#include <TList.h>
-#include <TMath.h>
-
-AliFemtoCutMonitorParticleYPt::AliFemtoCutMonitorParticleYPt():
-  fYPt(0),
-  fYPhi(0),
-  fPtPhi(0),
-  fEtaPhi(0),
-  fEtaPt(0),
-  fEtaPhiW(0),
-  fEtaPtW(0),
-  fDCARPt(0),
-  fDCAZPt(0),
-  fMass(0.13957)
-{
-  // Default constructor
-  fYPt = new TH2D("YPt", "Rapidity vs Pt",              140, -1.4, 1.4, 100, 0.0, 2.0);
-  fYPhi = new TH2D("YPhi", "Rapidity vs Phi",           140, -1.4, 1.4, 100, -TMath::Pi(), TMath::Pi());
-  fPtPhi = new TH2D("PtPhi", "Pt vs Phi",               100,  0.0, 2.0, 100, -TMath::Pi(), TMath::Pi());
-  fEtaPhi = new TH2D("EtaPhi", "Pseudorapidity vs Phi", 140, -1.4, 1.4, 100, -TMath::Pi(), TMath::Pi());
-  fEtaPt = new TH2D("EtaPt", "Pseudorapidity vs Pt",    140, -1.4, 1.4, 100, 0.0, 2.0);
-  // fEtaPhiW = new TH2D("EtaPhiW", "Pseudorapidity vs Phi chi2/N weighted", 140, -1.4, 1.4, 100, -TMath::Pi(), TMath::Pi());
-  // fEtaPtW = new TH2D("EtaPtW", "Pseudorapidity vs Pt chi2/N weighted",    140, -1.4, 1.4, 100, 0.0, 2.0)
-    ;
-  fDCARPt = new TH2D("DCARPt", "DCA in XY vs. Pt", 400, -2.0, 2.0, 100,0.0,2.0);
-  fDCAZPt = new TH2D("DCAZPt", "DCA in Z vs. Pt", 400, -2.0, 2.0, 100,0.0,2.0);
-}
-
-AliFemtoCutMonitorParticleYPt::AliFemtoCutMonitorParticleYPt(const char *aName, float aMass):
-  AliFemtoCutMonitor(),
-  fYPt(0),
-  fYPhi(0),
-  fPtPhi(0),
-  fEtaPhi(0),
-  fEtaPt(0),
-  fEtaPhiW(0),
-  fEtaPtW(0),
-  fDCARPt(0),
-  fDCAZPt(0),
-  fMass(aMass)
-{
-  // Normal constructor
-  char name[200];
-  snprintf(name, 200, "YPt%s", aName);
-  fYPt = new TH2D(name, "Rapdity vs Pt", 140, -1.4, 1.4, 100, 0.0, 2.0);
-  snprintf(name, 200, "YPhi%s", aName);
-  fYPhi = new TH2D(name, "Rapidity vs Phi",           140, -1.4, 1.4, 100, -TMath::Pi(), TMath::Pi());
-  snprintf(name, 200, "PtPhi%s", aName);
-  fPtPhi = new TH2D(name, "Pt vs Phi",               100,  0.0, 2.0, 100, -TMath::Pi(), TMath::Pi());
-  snprintf(name, 200, "EtaPhi%s", aName);
-  fEtaPhi = new TH2D(name, "Pseudorapidity vs Phi", 140, -1.4, 1.4, 100, -TMath::Pi(), TMath::Pi());
-  snprintf(name, 200, "EtaPt%s", aName);
-  fEtaPt = new TH2D(name, "Pseudorapidity vs Pt",    140, -1.4, 1.4, 100, 0.0, 2.0);
-  // snprintf(name, 200, "EtaPhiW%s", aName);
-  // fEtaPhiW = new TH2D(name, "Pseudorapidity vs Phi chi2/N weighted", 140, -1.4, 1.4, 100, -TMath::Pi(), TMath::Pi());
-  // snprintf(name, 200, "EtaPtW%s", aName);
-  // fEtaPtW = new TH2D(name, "Pseudorapidity vs Pt chi2/N weighted",    140, -1.4, 1.4, 100, 0.0, 2.0);
-  snprintf(name, 200, "DCARPt%s", aName);
-  fDCARPt = new TH2D(name, "DCA in XY vs. Pt", 400, -2.0, 2.0, 100,0.0,2.0);
-  snprintf(name, 200, "DCAZPt%s", aName);
-  fDCAZPt = new TH2D(name, "DCA in Z vs. Pt", 400, -2.0, 2.0, 100,0.0,2.0);
-}
-
-AliFemtoCutMonitorParticleYPt::AliFemtoCutMonitorParticleYPt(const AliFemtoCutMonitorParticleYPt &aCut):
-  AliFemtoCutMonitor(),
-  fYPt(0),
-  fYPhi(0),
-  fPtPhi(0),
-  fEtaPhi(0),
-  fEtaPt(0),
-  fEtaPhiW(0),
-  fEtaPtW(0),
-  fDCARPt(0),
-  fDCAZPt(0),
-  fMass(0.13957)
-{
-  // copy constructor
-  fYPt = new TH2D(*aCut.fYPt);
-  fYPhi = new TH2D(*aCut.fYPhi);
-  fPtPhi = new TH2D(*aCut.fPtPhi);
-  fEtaPhi = new TH2D(*aCut.fEtaPhi);
-  fEtaPt = new TH2D(*aCut.fEtaPt);
-  // fEtaPhiW = new TH2D(*aCut.fEtaPhiW);
-  // fEtaPtW = new TH2D(*aCut.fEtaPtW);
-  fDCARPt = new TH2D(*aCut.fDCARPt);
-  fDCAZPt = new TH2D(*aCut.fDCAZPt);
-  fMass = aCut.fMass; 
-}
-
-AliFemtoCutMonitorParticleYPt::~AliFemtoCutMonitorParticleYPt()
-{
-  // Destructor
-  delete fYPt;
-  delete fYPhi;
-  delete fPtPhi;
-  delete fEtaPhi;
-  delete fEtaPt;
-  // delete fEtaPhiW;
-  // delete fEtaPtW;
-  delete fDCARPt;
-  delete fDCAZPt;
-}
-
-AliFemtoCutMonitorParticleYPt& AliFemtoCutMonitorParticleYPt::operator=(const AliFemtoCutMonitorParticleYPt& aCut)
-{
-  // assignment operator
-  if (this == &aCut) 
-    return *this;
-
-  if (fYPt) delete fYPt;
-  fYPt = new TH2D(*aCut.fYPt);
-  if (fYPhi) delete fYPhi;
-  fYPhi = new TH2D(*aCut.fYPhi);
-  if (fPtPhi) delete fPtPhi;
-  fPtPhi = new TH2D(*aCut.fPtPhi);
-  if (fEtaPhi) delete fEtaPhi;
-  fEtaPhi = new TH2D(*aCut.fEtaPhi);
-  if (fEtaPt) delete fEtaPt;
-  fEtaPt = new TH2D(*aCut.fEtaPt);
-  // if (fEtaPhiW) delete fEtaPhiW;
-  // fEtaPhiW = new TH2D(*aCut.fEtaPhiW);
-  // if (fEtaPtW) delete fEtaPtW;
-  // fEtaPtW = new TH2D(*aCut.fEtaPtW);
-  if (fDCARPt) delete fDCARPt;
-  fDCARPt = new TH2D(*aCut.fDCARPt);
-  if (fDCAZPt) delete fDCAZPt;
-  fDCAZPt = new TH2D(*aCut.fDCAZPt);
-  
-  return *this;
-}
-
-AliFemtoString AliFemtoCutMonitorParticleYPt::Report(){ 
-  // Prepare report from the execution
-  string stemp = "*** AliFemtoCutMonitorParticleYPt report"; 
-  AliFemtoString returnThis = stemp;
-  return returnThis; 
-}
-
-void AliFemtoCutMonitorParticleYPt::Fill(const AliFemtoTrack* aTrack)
-{
-  // Fill in the monitor histograms with the values from the current track
-  float tEnergy = ::sqrt(aTrack->P().Mag2()+fMass*fMass);
-  float tRapidity = 0.5*::log((tEnergy+aTrack->P().z())/(tEnergy-aTrack->P().z()));
-  float tPt = ::sqrt((aTrack->P().x())*(aTrack->P().x())+(aTrack->P().y())*(aTrack->P().y()));
-  float tEta = -TMath::Log(TMath::Tan(aTrack->P().Theta()/2.0));
-  float tPhi = aTrack->P().Phi();
-  // float chi2w;
-  float dcar = aTrack->ImpactD();
-  float dcaz = aTrack->ImpactZ();
-  // if (aTrack->TPCncls() > 0)
-  //   chi2w = aTrack->TPCchi2()/aTrack->TPCncls();
-  // else
-  //   chi2w = 6.0;
-
-  //  cout << " CMYPt: " << fYPt << " " << fYPt->GetEntries() << " " << tRapidity << " " << tPt << endl;
-
-  fYPt->Fill(tRapidity, tPt);
-  fYPhi->Fill(tRapidity, tPhi);
-  fPtPhi->Fill(tPt, tPhi);
-  fEtaPhi->Fill(tEta, tPhi);
-  fEtaPt->Fill(tEta, tPt);
-  // fEtaPhiW->Fill(tEta, tPhi, chi2w);
-  // fEtaPtW->Fill(tEta, tPt, chi2w);
-  fDCARPt->Fill(dcar, tPt);
-  fDCAZPt->Fill(dcaz, tPt);
-}
-
-void AliFemtoCutMonitorParticleYPt::Write()
-{
-  // Write out the relevant histograms
-  fYPt->Write();
-  fYPhi->Write();
-  fPtPhi->Write();
-  fEtaPhi->Write();
-  fEtaPt->Write();
-  // fEtaPhiW->Write();
-  // fEtaPtW->Write();
-  fDCARPt->Write();
-  fDCAZPt->Write();
-}
-
-TList *AliFemtoCutMonitorParticleYPt::GetOutputList()
-{
-  TList *tOutputList = new TList();
-  tOutputList->Add(fYPt);
-  tOutputList->Add(fYPhi);
-  tOutputList->Add(fPtPhi);
-  tOutputList->Add(fEtaPhi);
-  tOutputList->Add(fEtaPt);
-  // tOutputList->Add(fEtaPhiW);
-  // tOutputList->Add(fEtaPtW);
-  tOutputList->Add(fDCARPt);
-  tOutputList->Add(fDCAZPt);
-
-  return tOutputList;
-}
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticleYPt.h b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoCutMonitorParticleYPt.h
deleted file mode 100644 (file)
index c7501d5..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-///                                                                          ///
-/// AliFemtoCutMonitorParticleYPt - the cut monitor for particles to study  ///
-/// the difference between reconstructed and true momentum    ///
-///                                                                          ///
-////////////////////////////////////////////////////////////////////////////////
-#ifndef AliFemtoCutMonitorParticleYPt_hh
-#define AliFemtoCutMonitorParticleYPt_hh
-
-class AliFemtoEvent;
-class AliFemtoTrack;
-class AliFemtoV0;
-class AliFemtoKink;
-class AliFemtoPair; // Gael 12/04/02
-class TH1D;
-class TH2D;
-class TList;
-#include "AliFemtoString.h"
-#include "AliFemtoParticleCollection.h"
-#include "AliFemtoCutMonitor.h"
-
-class AliFemtoCutMonitorParticleYPt : public AliFemtoCutMonitor{
-  
-public:
-  AliFemtoCutMonitorParticleYPt();
-  AliFemtoCutMonitorParticleYPt(const char *aName, float aMass);
-  AliFemtoCutMonitorParticleYPt(const AliFemtoCutMonitorParticleYPt &aCut);
-  virtual ~AliFemtoCutMonitorParticleYPt();
-
-  AliFemtoCutMonitorParticleYPt& operator=(const AliFemtoCutMonitorParticleYPt& aCut);
-
-  virtual AliFemtoString Report();
-  virtual void Fill(const AliFemtoEvent* aEvent) {AliFemtoCutMonitor::Fill(aEvent);}
-  virtual void Fill(const AliFemtoTrack* aTrack);
-  virtual void Fill(const AliFemtoV0* aV0) {AliFemtoCutMonitor::Fill(aV0);}
-  virtual void Fill(const AliFemtoKink* aKink) {AliFemtoCutMonitor::Fill(aKink);}
-  virtual void Fill(const AliFemtoPair* aPair) {AliFemtoCutMonitor::Fill(aPair);}
-  virtual void Fill(const AliFemtoParticleCollection* aCollection) {AliFemtoCutMonitor::Fill(aCollection);}
-  virtual void Fill(const AliFemtoEvent* aEvent,const AliFemtoParticleCollection* aCollection)
-  {AliFemtoCutMonitor::Fill(aEvent, aCollection);}
-
-
-  void Write();
-
-  virtual TList *GetOutputList();
-
-private:
-  TH2D *fYPt;    // Rapidity vs. Pt monitor
-  TH2D *fYPhi;   // Rapidity cs. Phi monitor
-  TH2D *fPtPhi;  // Pt vs. Phi monitor
-  TH2D *fEtaPhi; // Pseudorapidity vs. Phi monitor
-  TH2D *fEtaPt;  // Pseudorapidity vs. Pt monitor
-  TH2D *fEtaPhiW;// Pseudorapidity vs. Phi monitor chi2 weighted
-  TH2D *fEtaPtW; // Pseudorapidity vs. Pt monitor chi2 weighted
-  TH2D *fDCARPt; // Pt vs. DCA XY
-  TH2D *fDCAZPt; // Pt vs. DCA Z 
-  float fMass;   // Mass hypothesis
-};
-
-#endif
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoDummyPairCut.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoDummyPairCut.cxx
deleted file mode 100644 (file)
index 1d60033..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// AliFemtoDummyPairCut: a summy pair cut. Accepts all pairs             //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-/***************************************************************************
- *
- * $Id$
- *
- * Author: Mike Lisa, Ohio State, lisa@mps.ohio-state.edu
- ***************************************************************************
- *
- * Description: part of STAR HBT Framework: AliFemtoMaker package
- *   a do-nothing pair cut that simply says "true" to every pair           
- *
- ***************************************************************************
- *
- * $Log$
- * Revision 1.2.2.1  2007/10/12 14:28:37  akisiel
- * New wave of cleanup and rule conformance
- *
- * Revision 1.2  2007/05/22 09:01:42  akisiel
- * Add the possibiloity to save cut settings in the ROOT file
- *
- * Revision 1.1  2007/05/16 10:22:11  akisiel
- * Making the directory structure of AliFemto flat. All files go into one common directory
- *
- * Revision 1.2  2007/05/03 09:41:06  akisiel
- * Fixing Effective C++ warnings
- *
- * Revision 1.1.1.1  2007/04/25 15:38:41  panos
- * Importing the HBT code dir
- *
- * Revision 1.1.1.1  2007-03-07 10:14:49  mchojnacki
- * First version on CVS
- *
- * Revision 1.3  2000/01/25 17:35:02  laue
- * I. In order to run the stand alone version of the AliFemtoMaker the following
- * changes have been done:
- * a) all ClassDefs and ClassImps have been put into #ifdef __ROOT__ statements
- * b) unnecessary includes of StMaker.h have been removed
- * c) the subdirectory AliFemtoMaker/doc/Make has been created including everything
- * needed for the stand alone version
- *
- * II. To reduce the amount of compiler warning
- * a) some variables have been type casted
- * b) some destructors have been declared as virtual
- *
- * Revision 1.2  1999/07/06 22:33:21  lisa
- * Adjusted all to work in pro and new - dev itself is broken
- *
- * Revision 1.1.1.1  1999/06/29 16:02:56  lisa
- * Installation of AliFemtoMaker
- *
- **************************************************************************/
-
-#include "AliFemtoDummyPairCut.h"
-#include <string>
-#include <cstdio>
-
-#ifdef __ROOT__
-ClassImp(AliFemtoDummyPairCut)
-#endif
-
-//__________________
-AliFemtoDummyPairCut::AliFemtoDummyPairCut() :
-  fNPairsPassed(0),
-  fNPairsFailed(0)
-{
-  /* no-op */
-}
-//__________________
-AliFemtoDummyPairCut::~AliFemtoDummyPairCut(){
-  /* no-op */
-}
-//__________________
-bool AliFemtoDummyPairCut::Pass(const AliFemtoPair* /* pair */){
-  // Pass all pairs
-  bool temp = true;
-  temp ? fNPairsPassed++ : fNPairsFailed++;
-  return true;
-}
-//__________________
-AliFemtoString AliFemtoDummyPairCut::Report(){
-  // prepare a report from the execution
-  string stemp = "AliFemtoDummy Pair Cut - total dummy-- always returns true\n";
-  char ctemp[100];
-  snprintf(ctemp , 100, "Number of pairs which passed:\t%ld  Number which failed:\t%ld\n",fNPairsPassed,fNPairsFailed);
-  stemp += ctemp;
-  AliFemtoString returnThis = stemp;
-  return returnThis;
-}
-//__________________
-TList *AliFemtoDummyPairCut::ListSettings()
-{
-  // return a list of settings in a writable form
-  TList *tListSetttings = new TList();
-
-  return tListSetttings;
-}
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoDummyPairCut.h b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoDummyPairCut.h
deleted file mode 100644 (file)
index 49a14ef..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// AliFemtoDummyPairCut: a summy pair cut. Accepts all pairs             //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-/***************************************************************************
- *
- * $Id$
- *
- * Author: Mike Lisa, Ohio State, lisa@mps.ohio-state.edu
- ***************************************************************************
- *
- * Description: part of STAR HBT Framework: AliFemtoMaker package
- *   a do-nothing pair cut that simply says "true" to every pair           
- *
- ***************************************************************************
- *
- * $Log$
- * Revision 1.2.2.1  2007/10/12 14:28:37  akisiel
- * New wave of cleanup and rule conformance
- *
- * Revision 1.2  2007/05/22 09:01:42  akisiel
- * Add the possibiloity to save cut settings in the ROOT file
- *
- * Revision 1.1  2007/05/16 10:22:11  akisiel
- * Making the directory structure of AliFemto flat. All files go into one common directory
- *
- * Revision 1.2  2007/05/03 09:41:06  akisiel
- * Fixing Effective C++ warnings
- *
- * Revision 1.1.1.1  2007/04/25 15:38:41  panos
- * Importing the HBT code dir
- *
- * Revision 1.1.1.1  2007/03/07 10:14:49  mchojnacki
- * First version on CVS
- *
- * Revision 1.5  2000/03/23 22:57:28  laue
- * Clone() function implemented
- *
- * Revision 1.4  2000/01/25 17:35:03  laue
- * I. In order to run the stand alone version of the AliFemtoMaker the following
- * changes have been done:
- * a) all ClassDefs and ClassImps have been put into #ifdef __ROOT__ statements
- * b) unnecessary includes of StMaker.h have been removed
- * c) the subdirectory AliFemtoMaker/doc/Make has been created including everything
- * needed for the stand alone version
- *
- * II. To reduce the amount of compiler warning
- * a) some variables have been type casted
- * b) some destructors have been declared as virtual
- *
- * Revision 1.3  1999/10/15 01:57:05  lisa
- * Important enhancement of AliFemtoMaker - implement Franks CutMonitors
- * ----------------------------------------------------------
- * This means 3 new files in Infrastructure area (CutMonitor),
- * several specific CutMonitor classes in the Cut area
- * and a new base class in the Base area (AliFemtoCutMonitor).
- * This means also changing all Cut Base class header files from .h to .h
- * so we have access to CutMonitor methods from Cint command line.
- * This last means
- * 1) files which include these header files are slightly modified
- * 2) a side benefit: the TrackCuts and V0Cuts no longer need
- * a SetMass() implementation in each Cut class, which was stupid.
- * Also:
- * -----
- * Include Franks AliFemtoAssociationReader
- * ** None of these changes should affect any user **
- *
- * Revision 1.2  1999/07/06 22:33:21  lisa
- * Adjusted all to work in pro and new - dev itself is broken
- *
- * Revision 1.1.1.1  1999/06/29 16:02:56  lisa
- * Installation of AliFemtoMaker
- *
- **************************************************************************/
-
-
-#ifndef ALIFEMTODUMMYPAIRCUT_H
-#define ALIFEMTODUMMYPAIRCUT_H
-
-// do I need these lines ?
-//#ifndef StMaker_H
-//#include "StMaker.h"
-//#endif
-
-#include "AliFemtoPairCut.h"
-
-class AliFemtoDummyPairCut : public AliFemtoPairCut{
-public:
-  AliFemtoDummyPairCut();
-  AliFemtoDummyPairCut(const AliFemtoDummyPairCut&);
-  virtual ~AliFemtoDummyPairCut();
-  AliFemtoDummyPairCut& operator=(const AliFemtoDummyPairCut&);
-
-  virtual bool Pass(const AliFemtoPair*);
-  virtual AliFemtoString Report();
-  virtual TList *ListSettings();
-  AliFemtoDummyPairCut* Clone();
-
-private:
-  long fNPairsPassed;  // number of pairs analyzed by this cut that passed
-  long fNPairsFailed;  // number of pairs analyzed by this cut that failed
-
-#ifdef __ROOT__
-  ClassDef(AliFemtoDummyPairCut, 1)
-#endif
-};
-
-inline AliFemtoDummyPairCut::AliFemtoDummyPairCut(const AliFemtoDummyPairCut& c) : AliFemtoPairCut(c), fNPairsPassed(0), fNPairsFailed(0) { /* no-op */ }
-inline AliFemtoDummyPairCut& AliFemtoDummyPairCut::operator=(const AliFemtoDummyPairCut& c) {   if (this != &c) { AliFemtoPairCut::operator=(c); }  return *this; }
-inline AliFemtoDummyPairCut* AliFemtoDummyPairCut::Clone() { AliFemtoDummyPairCut* c = new AliFemtoDummyPairCut(*this); return c;}
-
-#endif
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEnumeration.h b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEnumeration.h
deleted file mode 100644 (file)
index 5c88e50..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/***************************************************************************
- *
- * $Id$
- *
- * Author: Frank Laue, BNL, laue@bnl.gov
- ***************************************************************************
- *
- ***************************************************************************
- *
- * $Log$
- * Revision 1.1.1.1  2007/04/25 15:38:41  panos
- * Importing the HBT code dir
- *
- * Revision 1.1.1.1  2007/03/07 10:14:49  mchojnacki
- * First version on CVS
- *
- * Revision 1.3  2003/01/08 19:43:12  perev
- * CleanUp
- *
- * Revision 1.2  2001/09/05 20:41:42  laue
- * Updates of the hbtMuDstTree microDSTs
- *
- * Revision 1.1  2001/06/21 19:15:45  laue
- * Modified fiels:
- *   CTH.h : new constructor added
- *   AliFemtoEvent, AliFemtoKink, AliFemtoTrack : constructors from the persistent
- *                                   (TTree) classes added
- *   AliFemtoLikeSignAnalysis : minor changes, for debugging
- *   AliFemtoTypes: split into different files
- * Added files: for the new TTree muDst's
- *   StExceptions.cxx StExceptions.h AliFemtoEnumeration.h
- *   AliFemtoHelix.h AliFemtoHisto.h AliFemtoString.h AliFemtoTFile.h
- *   AliFemtoTTreeEvent.cxx AliFemtoTTreeEvent.h AliFemtoTTreeKink.cxx
- *   AliFemtoTTreeKink.h AliFemtoTTreeTrack.cxx AliFemtoTTreeTrack.h
- *   AliFemtoTTreeV0.cxx AliFemtoTTreeV0.h AliFemtoVector.h
- *
- *
- ***************************************************************************/
-#ifndef AliFemtoEnumeration_hh
-#define AliFemtoEnumeration_hh
-
-enum AliFemtoParticleType {hbtUndefined, hbtTrack, hbtV0, hbtKink, hbtXi};
-enum AliFemtoIOMode {hbtRead, hbtWrite};
-
-#endif
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEvent.cxx b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEvent.cxx
deleted file mode 100644 (file)
index f09b0a8..0000000
+++ /dev/null
@@ -1,551 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-//  AliFemtoEvent: hold the information specific to the event and a      //
-//  track list                                                           //
-//  AliFemtoEvent is the "transient microDST"  Objects of this class are //
-//   generated from the input data by a Reader, and then presented to   //
-//   the Cuts of the various active Analyses.                           //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-#include "AliFemtoEvent.h"
-#include "AliFemtoTrack.h"
-#include "AliFemtoV0.h"
-#include "AliFemtoXi.h"
-#include "AliFemtoKink.h"
-#include "AliFemtoTrackCut.h"
-#include "AliFemtoV0Cut.h"
-#include "AliFemtoXiCut.h"
-#include "AliFemtoKinkCut.h"
-#include "PhysicalConstants.h"
-#include "SystemOfUnits.h"
-#include "AliEventplane.h"
-
-// Mike removed all of the AliFemtoTTree stuff here 21apr2006 - it was not used for a long time.
-
-//___________________
-AliFemtoEvent::AliFemtoEvent():
-  fEventNumber(0),
-  fRunNumber(0),
-  fNumberOfTracks(0),
-  fNormalizedMult(-2),
-  fSPDMult(0),
-  fEstimateITSTPC(0),
-  fEstimateTracklets(0),
-  fEstimateITSPure(0),
-  fCentralityV0(0),
-  fCentralityFMD(0),
-  fCentralitySPD1(0),
-  fCentralityTrk(0),
-  fMagneticField(0),
-  fIsCollisionCandidate(kTRUE),
-  fPrimVertPos(0,0,0),
-  fPrimVertCov(),
-  fTrackCollection(0),
-  fV0Collection(0),
-  fXiCollection(0),
-  fKinkCollection(0),
-  fZDCN1Energy(0),   
-  fZDCP1Energy(0),   
-  fZDCN2Energy(0),   
-  fZDCP2Energy(0),   
-  fZDCEMEnergy(0),   
-  fZDCParticipants(0),
-  fTriggerMask(0),  
-  fTriggerCluster(0),
-  fReactionPlaneAngle(0),
-  fEP(0)
-{
-  // Default constructor
-  fPrimVertPos[0]=-999.0;
-  fPrimVertPos[1]=-999.0;
-  fPrimVertPos[2]=-999.0;
-  fPrimVertCov[0]=0.000000000001;
-  fPrimVertCov[1]=0.000000000001;
-  fPrimVertCov[2]=0.000000000001;
-  fPrimVertCov[3]=0.000000000001;
-  fPrimVertCov[4]=0.000000000001;
-  fPrimVertCov[5]=0.000000000001;
-  fTrackCollection = new AliFemtoTrackCollection;
-  fV0Collection = new AliFemtoV0Collection;
-  fXiCollection = new AliFemtoXiCollection;
-  fKinkCollection = new AliFemtoKinkCollection;
-  fMagneticField=0.0;
-}
-//___________________
-AliFemtoEvent::AliFemtoEvent(const AliFemtoEvent& ev, AliFemtoTrackCut* tCut, AliFemtoV0Cut* vCut, AliFemtoXiCut* xCut, AliFemtoKinkCut* kCut):
-  fEventNumber(0),
-  fRunNumber(0),
-  fNumberOfTracks(0),
-  fNormalizedMult(-2),
-  fSPDMult(0),
-  fEstimateITSTPC(0),
-  fEstimateTracklets(0),
-  fEstimateITSPure(0),
-  fCentralityV0(0),
-  fCentralityFMD(0),
-  fCentralitySPD1(0),
-  fCentralityTrk(0),
-  fMagneticField(0),
-  fIsCollisionCandidate(kTRUE),
-  fPrimVertPos(0,0,0),
-  fPrimVertCov(),
-  fTrackCollection(0),
-  fV0Collection(0),
-  fXiCollection(0),
-  fKinkCollection(0),
-  fZDCN1Energy(0),   
-  fZDCP1Energy(0),   
-  fZDCN2Energy(0),   
-  fZDCP2Energy(0),   
-  fZDCEMEnergy(0),   
-  fZDCParticipants(0),
-  fTriggerMask(0),  
-  fTriggerCluster(0),
-  fReactionPlaneAngle(0),
-  fEP(0)
-{ // copy constructor with track and v0 cuts
-  //cout << "AliFemtoEvent::AliFemtoEvent(const AliFemtoEvent& ev, AliFemtoTrackCut* tCut, AliFemtoV0Cut* vCut, AliFemtoV0Cut* kCut)" << endl;
-  fEventNumber = ev.fEventNumber;
-  fRunNumber = ev.fRunNumber;
-  
-  SetPrimVertCov(ev.PrimVertCov());
-
-  fZDCN1Energy=ev.fZDCN1Energy;     
-  fZDCP1Energy=ev.fZDCP1Energy;      
-  fZDCN2Energy=ev.fZDCN2Energy;      
-  fZDCP2Energy=ev.fZDCP2Energy;      
-  fZDCEMEnergy=ev.fZDCEMEnergy;
-  fZDCParticipants=ev.fZDCParticipants;
-  fNumberOfTracks = ev.fNumberOfTracks;
-  fNormalizedMult = ev.fNormalizedMult;
-  fEstimateITSTPC = ev.fEstimateITSTPC;
-  fEstimateTracklets = ev.fEstimateTracklets;
-  fEstimateITSPure = ev.fEstimateITSPure;
-  fCentralityV0 = ev.fCentralityV0; 
-  fCentralityFMD = ev.fCentralityFMD;
-  fCentralitySPD1 = ev.fCentralitySPD1;
-  fCentralityTrk = ev.fCentralityTrk;
-  fMagneticField= ev.fMagneticField;
-  fIsCollisionCandidate = ev.fIsCollisionCandidate;
-
-  fTriggerMask=ev.fTriggerMask;     // Trigger Type (mask)
-  fTriggerCluster=ev.fTriggerCluster;
-  fReactionPlaneAngle=ev.fReactionPlaneAngle;
-  fEP=ev.fEP;
-
-  // create collections
-  fTrackCollection = new AliFemtoTrackCollection;
-  fV0Collection = new AliFemtoV0Collection;
-  fXiCollection = new AliFemtoXiCollection;
-  fKinkCollection = new AliFemtoKinkCollection;
-  // copy track collection  
-  for ( AliFemtoTrackIterator tIter=ev.fTrackCollection->begin(); tIter!=ev.fTrackCollection->end(); tIter++) {
-    if ( !tCut || tCut->Pass(*tIter) ) {
-      AliFemtoTrack* trackCopy = new AliFemtoTrack(**tIter);
-      fTrackCollection->push_back(trackCopy);
-    }
-  }
-  // copy v0 collection
-  for ( AliFemtoV0Iterator vIter=ev.fV0Collection->begin(); vIter!=ev.fV0Collection->end(); vIter++) {
-    if ( !vCut || vCut->Pass(*vIter) ) {
-      AliFemtoV0* v0Copy = new AliFemtoV0(**vIter);
-      fV0Collection->push_back(v0Copy);
-    }
-  }
-  // copy xi collection
-  for ( AliFemtoXiIterator xIter=ev.fXiCollection->begin(); xIter!=ev.fXiCollection->end(); xIter++) {
-    if ( !xCut || xCut->Pass(*xIter) ) {
-      AliFemtoXi* xiCopy = new AliFemtoXi(**xIter);
-      fXiCollection->push_back(xiCopy);
-    }
-  }
-  // copy kink collection  
-  for ( AliFemtoKinkIterator kIter=ev.fKinkCollection->begin(); kIter!=ev.fKinkCollection->end(); kIter++) {
-    if ( !kCut || kCut->Pass(*kIter) ) {
-      //cout << " kinkCut passed " << endl;
-      AliFemtoKink* kinkCopy = new AliFemtoKink(**kIter);
-      fKinkCollection->push_back(kinkCopy);
-    }
-  }
-}
-//___________________
-AliFemtoEvent::AliFemtoEvent(const AliFemtoEvent& ev):
-  fEventNumber(0),
-  fRunNumber(0),
-  fNumberOfTracks(0),
-  fNormalizedMult(-2),
-  fSPDMult(0),
-  fEstimateITSTPC(0),
-  fEstimateTracklets(0),
-  fEstimateITSPure(0),
-  fCentralityV0(0),
-  fCentralityFMD(0),
-  fCentralitySPD1(0),
-  fCentralityTrk(0),
-  fMagneticField(0),
-  fIsCollisionCandidate(kTRUE),
-  fPrimVertPos(0,0,0),
-  fPrimVertCov(),
-  fTrackCollection(0),
-  fV0Collection(0),
-  fXiCollection(0),
-  fKinkCollection(0),
-  fZDCN1Energy(0),   
-  fZDCP1Energy(0),   
-  fZDCN2Energy(0),   
-  fZDCP2Energy(0),   
-  fZDCEMEnergy(0),   
-  fZDCParticipants(0),
-  fTriggerMask(0),  
-  fTriggerCluster(0),
-  fReactionPlaneAngle(0),
-  fEP(0)
-{ 
-  // copy constructor 
-  fEventNumber = ev.fEventNumber;
-  fRunNumber = ev.fRunNumber;
-  
-  SetPrimVertCov(ev.PrimVertCov());
-
-  fZDCN1Energy=ev.fZDCN1Energy;     
-  fZDCP1Energy=ev.fZDCP1Energy;      
-  fZDCN2Energy=ev.fZDCN2Energy;      
-  fZDCP2Energy=ev.fZDCP2Energy;      
-  fZDCEMEnergy=ev.fZDCEMEnergy;
-  fZDCParticipants=ev.fZDCParticipants;
-  fNumberOfTracks = ev.fNumberOfTracks;
-  fEstimateITSTPC = ev.fEstimateITSTPC;
-  fEstimateTracklets = ev.fEstimateTracklets;
-  fEstimateITSPure = ev.fEstimateITSPure;
-  fCentralityV0 = ev.fCentralityV0; 
-  fCentralityFMD = ev.fCentralityFMD;
-  fCentralitySPD1 = ev.fCentralitySPD1;
-  fCentralityTrk = ev.fCentralityTrk;
-  fMagneticField= ev.fMagneticField;
-  fIsCollisionCandidate = ev.fIsCollisionCandidate;
-  fTriggerMask=ev.fTriggerMask;     // Trigger Type (mask)
-  fTriggerCluster=ev.fTriggerCluster;
-  fReactionPlaneAngle=ev.fReactionPlaneAngle;
-  fEP=ev.fEP;
-  // create collections
-  fTrackCollection = new AliFemtoTrackCollection;
-  fV0Collection = new AliFemtoV0Collection;
-  fXiCollection = new AliFemtoXiCollection;
-  fKinkCollection = new AliFemtoKinkCollection;
-  // copy track collection  
-  for ( AliFemtoTrackIterator tIter=ev.fTrackCollection->begin(); tIter!=ev.fTrackCollection->end(); tIter++) {
-    AliFemtoTrack* trackCopy = new AliFemtoTrack(**tIter);
-    fTrackCollection->push_back(trackCopy);
-  }
-  // copy v0 collection
-  for ( AliFemtoV0Iterator vIter=ev.fV0Collection->begin(); vIter!=ev.fV0Collection->end(); vIter++) {
-    AliFemtoV0* v0Copy = new AliFemtoV0(**vIter);
-    fV0Collection->push_back(v0Copy);
-  }
-  // copy xi collection
-  for ( AliFemtoXiIterator xIter=ev.fXiCollection->begin(); xIter!=ev.fXiCollection->end(); xIter++) {
-    AliFemtoXi* xiCopy = new AliFemtoXi(**xIter);
-    fXiCollection->push_back(xiCopy);
-  }
-  // copy kink collection  
-  for ( AliFemtoKinkIterator kIter=ev.fKinkCollection->begin(); kIter!=ev.fKinkCollection->end(); kIter++) {
-    //cout << " kinkCut passed " << endl;
-    AliFemtoKink* kinkCopy = new AliFemtoKink(**kIter);
-    fKinkCollection->push_back(kinkCopy);
-  }
-}
-//______________________________
-AliFemtoEvent& AliFemtoEvent::operator=(const AliFemtoEvent& aEvent)
-{
-  // assignment operator
-  if (this == &aEvent)
-    return *this;
-
-  fEventNumber = aEvent.fEventNumber;
-  fRunNumber = aEvent.fRunNumber;
-  
-  fZDCN1Energy=aEvent.fZDCN1Energy;     
-  fZDCP1Energy=aEvent.fZDCP1Energy;      
-  fZDCN2Energy=aEvent.fZDCN2Energy;      
-  fZDCP2Energy=aEvent.fZDCP2Energy;      
-  fZDCEMEnergy=aEvent.fZDCEMEnergy;
-  fZDCParticipants=aEvent.fZDCParticipants;
-  fNumberOfTracks = aEvent.fNumberOfTracks;
-  fEstimateITSTPC = aEvent.fEstimateITSTPC;
-  fEstimateTracklets = aEvent.fEstimateTracklets;
-  fEstimateITSPure = aEvent.fEstimateITSPure;
-  fCentralityV0 = aEvent.fCentralityV0; 
-  fCentralityFMD = aEvent.fCentralityFMD;
-  fCentralitySPD1 = aEvent.fCentralitySPD1;
-  fCentralityTrk = aEvent.fCentralityTrk;
-  fNormalizedMult = aEvent.fNormalizedMult;
-  fEstimateITSTPC = aEvent.fEstimateITSTPC;
-  fEstimateTracklets = aEvent.fEstimateTracklets;
-  fEstimateITSPure = aEvent.fEstimateITSPure;
-  fMagneticField= aEvent.fMagneticField;
-  fIsCollisionCandidate = aEvent.fIsCollisionCandidate;
-
-  fTriggerMask=aEvent.fTriggerMask;     // Trigger Type (mask)
-  fTriggerCluster=aEvent.fTriggerCluster;
-  fReactionPlaneAngle=aEvent.fReactionPlaneAngle;
-  fEP=aEvent.fEP;
-  if (fTrackCollection) {
-    for (AliFemtoTrackIterator iter=fTrackCollection->begin();iter!=fTrackCollection->end();iter++){
-      delete *iter;
-    }
-    fTrackCollection->clear();
-    delete fTrackCollection;
-  }
-  fTrackCollection = new AliFemtoTrackCollection;
-
-  if (fV0Collection) {
-    for (AliFemtoV0Iterator tV0iter=fV0Collection->begin();tV0iter!=fV0Collection->end();tV0iter++){
-      delete *tV0iter;
-    }//added by M Chojnacki To avodid memory leak 
-    fV0Collection->clear();
-    delete fV0Collection;
-  }
-
-  fV0Collection = new AliFemtoV0Collection;
-
-  if (fXiCollection) {
-    for (AliFemtoXiIterator tXiIter=fXiCollection->begin();tXiIter!=fXiCollection->end();tXiIter++){
-      delete *tXiIter;
-    }
-    fXiCollection->clear();
-    delete fXiCollection;
-  }
-  fXiCollection = new AliFemtoXiCollection;
-  
-  if (fKinkCollection) {
-    for (AliFemtoKinkIterator kinkIter=fKinkCollection->begin();kinkIter!=fKinkCollection->end();kinkIter++){
-      delete *kinkIter;
-    }
-    fKinkCollection->clear();
-    delete fKinkCollection;
-  }
-  fKinkCollection = new AliFemtoKinkCollection;
-
-  // copy track collection  
-  for ( AliFemtoTrackIterator tIter=aEvent.fTrackCollection->begin(); tIter!=aEvent.fTrackCollection->end(); tIter++) {
-    AliFemtoTrack* trackCopy = new AliFemtoTrack(**tIter);
-    fTrackCollection->push_back(trackCopy);
-  }
-  // copy v0 collection
-  for ( AliFemtoV0Iterator vIter=aEvent.fV0Collection->begin(); vIter!=aEvent.fV0Collection->end(); vIter++) {
-    AliFemtoV0* v0Copy = new AliFemtoV0(**vIter);
-    fV0Collection->push_back(v0Copy);
-  }
-  // copy xi collection
-  for ( AliFemtoXiIterator xIter=aEvent.fXiCollection->begin(); xIter!=aEvent.fXiCollection->end(); xIter++) {
-    AliFemtoXi* xiCopy = new AliFemtoXi(**xIter);
-    fXiCollection->push_back(xiCopy);
-  }
-  // copy kink collection  
-  for ( AliFemtoKinkIterator kIter=aEvent.fKinkCollection->begin(); kIter!=aEvent.fKinkCollection->end(); kIter++) {
-    AliFemtoKink* kinkCopy = new AliFemtoKink(**kIter);
-    fKinkCollection->push_back(kinkCopy);
-  }
-
-  return *this;
-}
-
-//___________________
-AliFemtoEvent::~AliFemtoEvent(){
-  // destructor
-#ifdef STHBTDEBUG
-  cout << " AliFemtoEvent::~AliFemtoEvent() " << endl;
-#endif
-  for (AliFemtoTrackIterator iter=fTrackCollection->begin();iter!=fTrackCollection->end();iter++){
-    delete *iter;
-  }
-  fTrackCollection->clear();
-  delete fTrackCollection;
-  //must do the same for the V0 collection
-  for (AliFemtoV0Iterator tV0iter=fV0Collection->begin();tV0iter!=fV0Collection->end();tV0iter++){
-    delete *tV0iter;
-  }//added by M Chojnacki To avodid memory leak 
-  fV0Collection->clear();
-  delete fV0Collection;
-  //must do the same for the Xi collection
-  for (AliFemtoXiIterator tXiIter=fXiCollection->begin();tXiIter!=fXiCollection->end();tXiIter++){
-    delete *tXiIter;
-  }
-  fXiCollection->clear();
-  delete fXiCollection;
-  //must do the same for the Kink collection
-  for (AliFemtoKinkIterator kinkIter=fKinkCollection->begin();kinkIter!=fKinkCollection->end();kinkIter++){
-    delete *kinkIter;
-  }
-  fKinkCollection->clear();
-  delete fKinkCollection;
-}
-//___________________
-
-
-
-void AliFemtoEvent::SetEventNumber(const unsigned short& event){fEventNumber = event;}
-void AliFemtoEvent::SetRunNumber(const int& runNum){fRunNumber = runNum;}
-
-
-void AliFemtoEvent::SetZDCN1Energy(const float& aZDCN1Energy){fZDCN1Energy=aZDCN1Energy;}
-void AliFemtoEvent::SetZDCP1Energy(const float& aZDCP1Energy){fZDCP1Energy=aZDCP1Energy;}      
-void AliFemtoEvent::SetZDCN2Energy(const float& aZDCN2Energy){fZDCN2Energy=aZDCN2Energy;}      
-void AliFemtoEvent::SetZDCP2Energy(const float& aZDCP2Energy){fZDCP2Energy=aZDCP2Energy;}      
-void AliFemtoEvent::SetZDCEMEnergy(const float& aZDCEMEnergy){fZDCEMEnergy=aZDCEMEnergy;}    
-void AliFemtoEvent::SetZDCParticipants(const unsigned int& aZDCParticipants){fZDCParticipants=aZDCParticipants;}
-
-void AliFemtoEvent::SetNumberOfTracks(const unsigned short& tracks){fNumberOfTracks = tracks;}
-void AliFemtoEvent::SetNormalizedMult(const int& i){fNormalizedMult = i;}
-void AliFemtoEvent::SetSPDMult(const int& i){fSPDMult = i;}
-
-void AliFemtoEvent::SetPrimVertPos(const AliFemtoThreeVector& vp){fPrimVertPos = vp;}
-void AliFemtoEvent::SetPrimVertCov(const double* v){
-  fPrimVertCov[0] = v[0];
-  fPrimVertCov[1] = v[1];
-  fPrimVertCov[2] = v[2];
-  fPrimVertCov[3] = v[3];
-  fPrimVertCov[4] = v[4];
-  fPrimVertCov[5] = v[5];
-}
-void AliFemtoEvent::SetMagneticField(const double& magF){fMagneticField = magF;}
-void AliFemtoEvent::SetIsCollisionCandidate(const bool& is){fIsCollisionCandidate = is;}
-
-void AliFemtoEvent::SetTriggerMask(const unsigned long int& aTriggerMask) {fTriggerMask=aTriggerMask;}
-void AliFemtoEvent::SetTriggerCluster(const unsigned char& aTriggerCluster) {fTriggerCluster=aTriggerCluster;}
-
-
-unsigned short AliFemtoEvent::EventNumber() const {return fEventNumber;}
-int            AliFemtoEvent::RunNumber() const {return fRunNumber;}
-
-
-
-unsigned short AliFemtoEvent::NumberOfTracks() const {return fNumberOfTracks;}
-
-AliFemtoV0Collection* AliFemtoEvent::V0Collection() const {return fV0Collection;}
-AliFemtoXiCollection* AliFemtoEvent::XiCollection() const {return fXiCollection;}
-AliFemtoKinkCollection* AliFemtoEvent::KinkCollection() const {return fKinkCollection;}
-AliFemtoTrackCollection* AliFemtoEvent::TrackCollection() const {return fTrackCollection;}
-AliFemtoThreeVector AliFemtoEvent::PrimVertPos() const {return fPrimVertPos;}
-const double* AliFemtoEvent::PrimVertCov() const {return fPrimVertCov;}
-double AliFemtoEvent::MagneticField() const {return fMagneticField;}
-unsigned long int AliFemtoEvent::TriggerMask() const {return fTriggerMask;}
-unsigned char AliFemtoEvent::TriggerCluster() const {return fTriggerCluster;}
-bool AliFemtoEvent::IsCollisionCandidate() const {return fIsCollisionCandidate;}
-
-
-float AliFemtoEvent::ZDCN1Energy() const {return fZDCN1Energy;}       
-float AliFemtoEvent::ZDCP1Energy() const {return fZDCP1Energy;}       
-float AliFemtoEvent::ZDCN2Energy() const {return fZDCN2Energy;}       
-float AliFemtoEvent::ZDCP2Energy() const {return fZDCP2Energy;}       
-float AliFemtoEvent::ZDCEMEnergy() const {return fZDCEMEnergy;}   
-unsigned int  AliFemtoEvent::ZDCParticipants() const {return fZDCParticipants;}
-
-void AliFemtoEvent::SetReactionPlaneAngle(const float& a) { fReactionPlaneAngle = a;}
-float AliFemtoEvent::ReactionPlaneAngle() const { return fReactionPlaneAngle; }
-void AliFemtoEvent::SetEP(AliEventplane* ep) { fEP = ep;}
-AliEventplane* AliFemtoEvent::EP() const {return fEP; }
-
-//----------------------------- below here is only for star
-
-int AliFemtoEvent::UncorrectedNumberOfNegativePrimaries() const
-{
-  return NumberOfTracks()/2;
-}
-
-int AliFemtoEvent::SPDMultiplicity() const
-{
-  return fSPDMult;
-}
-
-int AliFemtoEvent::UncorrectedNumberOfPrimaries() const
-{
-  if (fNormalizedMult < -1) {
-    // Count number of normalized charged tracks 
-    Int_t tNormTrackCount = 0;
-    for (AliFemtoTrackIterator iter=fTrackCollection->begin();iter!=fTrackCollection->end();iter++){
-      if (!((*iter)->Flags()&(AliFemtoTrack::kTPCrefit))) continue;
-      if ((*iter)->TPCncls() < 50) continue;
-      if ((*iter)->TPCchi2()/(*iter)->TPCncls() > 60.0) continue;
-      if ((*iter)->ImpactD() > 6.0) continue;
-      if ((*iter)->ImpactZ() > 6.0) continue;
-      if (fabs((*iter)->P().PseudoRapidity()) > 0.9) continue;
-      
-      tNormTrackCount++;
-    }
-    return tNormTrackCount;
-  }
-
-  return fNormalizedMult;
-  //  return NumberOfTracks();
-}
-
-unsigned short AliFemtoEvent::MultiplicityEstimateITSTPC() const
-{
-  return fEstimateITSTPC;
-}
-
-unsigned short AliFemtoEvent::MultiplicityEstimateTracklets() const
-{
-  return fEstimateTracklets;
-}
-
-unsigned short AliFemtoEvent::MultiplicityEstimateITSPure() const
-{
-  return fEstimateITSPure;
-}
-
-void AliFemtoEvent::SetMultiplicityEstimateITSTPC(const unsigned short &s)
-{
-  fEstimateITSTPC = s;
-}
-
-void AliFemtoEvent::SetMultiplicityEstimateTracklets(const unsigned short &s)
-{
-  fEstimateTracklets = s;
-}
-
-void AliFemtoEvent::SetMultiplicityEstimateITSPure(const unsigned short &s)
-{
-  fEstimateITSPure = s;
-}
-
-void AliFemtoEvent::SetCentralityV0(const float &c)
-{
-  fCentralityV0 = c;
-}
-
-void AliFemtoEvent::SetCentralityFMD(const float &c)
-{
-  fCentralityFMD = c;
-}
-
-void AliFemtoEvent::SetCentralitySPD1(const float &c)
-{
-  fCentralitySPD1 = c;
-}
-
-void AliFemtoEvent::SetCentralityTrk(const float &c)
-{
-  fCentralityTrk = c;
-}
-
-float AliFemtoEvent::CentralityV0() const
-{
-  return fCentralityV0;
-}
-
-float AliFemtoEvent::CentralityFMD() const
-{
-  return fCentralityFMD;
-}
-
-float AliFemtoEvent::CentralitySPD1() const
-{
-  return fCentralitySPD1;
-}
-
-float AliFemtoEvent::CentralityTrk() const
-{
-  return fCentralityTrk;
-}
diff --git a/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEvent.h b/PWG2/FEMTOSCOPY/AliFemto/AliFemtoEvent.h
deleted file mode 100644 (file)
index 1b56114..0000000
+++ /dev/null
@@ -1,157 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-//  AliFemtoEvent: hold the information specific to the event and a      //
-//  track list                                                           //
-//  AliFemtoEvent is the "transient microDST"  Objects of this class are //
-//   generated from the input data by a Reader, and then presented to   //
-//   the Cuts of the various active Analyses.                           //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-#ifndef ALIFEMTOEVENT_H
-#define ALIFEMTOEVENT_H
-
-#include "AliFemtoTypes.h"
-#include "AliFemtoTrackCollection.h"
-#include "AliFemtoV0Collection.h"
-#include "AliFemtoXiCollection.h"
-#include "AliFemtoKinkCollection.h"
-
-class AliFemtoTrackCut;
-class AliFemtoV0Cut;
-class AliFemtoXiCut;
-class AliFemtoKinkCut;
-class AliEventplane;
-
-#ifdef __ROOT__
-// the following encapsulation by malisa 21apr2006
-#ifndef __NO_STAR_DEPENDENCE_ALLOWED__
-class StMuDst;
-#endif
-#endif
-
-class AliFemtoEvent{
-public:
-  AliFemtoEvent();
-#ifdef __ROOT__
-#ifndef __NO_STAR_DEPENDENCE_ALLOWED__
-//
-#endif
-#endif
-  
-  AliFemtoEvent(const AliFemtoEvent& ev, AliFemtoTrackCut* tCut=0, AliFemtoV0Cut* vCut=0,  AliFemtoXiCut* xCut=0, AliFemtoKinkCut* kCut=0); // copy constructor with track and v0 cuts
-  AliFemtoEvent(const AliFemtoEvent& ev); // copy constructor
-  ~AliFemtoEvent();
-  AliFemtoEvent& operator=(const AliFemtoEvent& aEvent);
-
-  unsigned short EventNumber() const;
-  int RunNumber() const;
-  unsigned short NumberOfTracks() const;
-  AliFemtoThreeVector PrimVertPos() const;
-  const double* PrimVertCov() const;
-  AliFemtoV0Collection* V0Collection() const;
-  AliFemtoXiCollection* XiCollection() const;
-  AliFemtoKinkCollection* KinkCollection() const;
-  AliFemtoTrackCollection* TrackCollection() const;
-  double MagneticField() const;
-  bool IsCollisionCandidate() const;
-
-  //functions for alice variables
-  float ZDCN1Energy() const;      
-  float ZDCP1Energy() const;      
-  float ZDCN2Energy() const;      
-  float ZDCP2Energy() const;      
-  float ZDCEMEnergy() const;    
-  unsigned int ZDCParticipants() const; 
-
-  unsigned long int     TriggerMask() const;     
-  unsigned char      TriggerCluster() const;  
-
-  float ReactionPlaneAngle() const;
-  AliEventplane* EP() const;
-  
-  void SetEventNumber(const unsigned short& s);
-  void SetRunNumber(const int& i);
-  void SetNumberOfTracks(const unsigned short& s);
-  void SetNormalizedMult(const int& i);
-  void SetMultiplicityEstimateITSTPC(const unsigned short &s);
-  void SetMultiplicityEstimateTracklets(const unsigned short &s);
-  void SetMultiplicityEstimateITSPure(const unsigned short &s);
-  void SetCentralityV0(const float &c);
-  void SetCentralityFMD(const float &c);
-  void SetCentralitySPD1(const float &c);
-  void SetCentralityTrk(const float &c);
-  void SetSPDMult(const int& i);
-  void SetPrimVertPos(const AliFemtoThreeVector& v);
-  void SetPrimVertCov(const double* v);
-  void SetMagneticField(const double& x);
-  void SetIsCollisionCandidate(const bool& is);
-
-   //functions for alice variables
-  void SetZDCN1Energy(const float& x);      
-  void SetZDCP1Energy(const float& x);      
-  void SetZDCN2Energy(const float& x);      
-  void SetZDCP2Energy(const float& x);      
-  void SetZDCEMEnergy(const float& x);    
-  void SetZDCParticipants(const unsigned int& i);
-  
-  void SetTriggerMask(const unsigned long int& i);     
-  void SetTriggerCluster(const unsigned char& c); 
-
-  void SetReactionPlaneAngle(const float& a);</