Merge branch 'dev' of git.jinr.ru:nica/mpdroot into dev

mpd_scheduler @ 57e05451

-Subproject commit 11b65750e23c7de6c36c6444f39370da2f1d1a13
+Subproject commit 57e05451cd317fa51fe66b48c78575d4654f3bb3

macro/profiling/Makefile

 runReco:
-	g++ -g -O0 -o $@ runRecoCpc30.C -I`root-config --incdir` -I/opt/fairsoft/install/include -I$(VMCWORKDIR)/base/event -I$(VMCWORKDIR)/base/field -I$(VMCWORKDIR)/base/sim -I$(VMCWORKDIR)/base/source -I$(VMCWORKDIR)/base/steer -I$(VMCWORKDIR)/geobase -I$(VMCWORKDIR)/parbase -I$(VMCWORKDIR)/mcstack -I$(VMCWORKDIR)/mpdfield -I$(VMCWORKDIR)/generators -I$(VMCWORKDIR)/passive -I$(VMCWORKDIR)/trackbase -I$(VMCWORKDIR)/clustering -I$(VMCWORKDIR)/mpdbase -I$(VMCWORKDIR)/mpddata -I$(VMCWORKDIR)/cpc -I$(VMCWORKDIR)/ffd -I$(VMCWORKDIR)/kalman -I$(VMCWORKDIR)/lhetrack -I$(VMCWORKDIR)/geane -I$(VMCWORKDIR)/strawendcap -I$(VMCWORKDIR)/sts -I$(VMCWORKDIR)/ndet -I$(VMCWORKDIR)/etof -I$(VMCWORKDIR)/emc -I$(VMCWORKDIR)/tpc -I$(VMCWORKDIR)/tof -I$(VMCWORKDIR)/zdc -I$(VMCWORKDIR)/fairtools -L`root-config --libdir` -L"/usr/lib64" -L/opt/fairsoft/install/lib -L$(VMCWORKDIR)/build/lib -lMpdData -lCpc -lEmc -lCluster -lEtof -lFfd -lLHETrack -lStrawendcap -lSts -ltpc -lZdc -lTof -lPassive -lKalman -lGen -lMpdBase -lBase -lMpdBase -lFairTools -lMpdField -lMCStack -lTrkBase -lParBase -lGeoBase -lGeane -lGen -lXMLIO -lMinuit -lGeom -lGeomPainter -lVMC -lEG `root-config --glibs` -lpthread
+	g++ -g -O0 -o $@ runRecoCpc30.cxx -I`root-config --incdir` -I/opt/fairsoft/install/include -I$(VMCWORKDIR)/base/event -I$(VMCWORKDIR)/base/field -I$(VMCWORKDIR)/base/sim -I$(VMCWORKDIR)/base/source -I$(VMCWORKDIR)/base/steer -I$(VMCWORKDIR)/geobase -I$(VMCWORKDIR)/parbase -I$(VMCWORKDIR)/mcstack -I$(VMCWORKDIR)/mpdfield -I$(VMCWORKDIR)/generators -I$(VMCWORKDIR)/passive -I$(VMCWORKDIR)/trackbase -I$(VMCWORKDIR)/clustering -I$(VMCWORKDIR)/mpdbase -I$(VMCWORKDIR)/mpddata -I$(VMCWORKDIR)/cpc -I$(VMCWORKDIR)/ffd -I$(VMCWORKDIR)/kalman -I$(VMCWORKDIR)/lhetrack -I$(VMCWORKDIR)/geane -I$(VMCWORKDIR)/strawendcap -I$(VMCWORKDIR)/sts -I$(VMCWORKDIR)/ndet -I$(VMCWORKDIR)/etof -I$(VMCWORKDIR)/emc -I$(VMCWORKDIR)/tpc -I$(VMCWORKDIR)/tof -I$(VMCWORKDIR)/zdc -I$(VMCWORKDIR)/fairtools -L`root-config --libdir` -L"/usr/lib64" -L/opt/fairsoft/install/lib -L$(VMCWORKDIR)/build/lib -lMpdData -lCpc -lEmc -lCluster -lEtof -lFfd -lLHETrack -lStrawendcap -lSts -ltpc -lZdc -lTof -lPassive -lKalman -lGen -lMpdBase -lBase -lMpdBase -lFairTools -lMpdField -lMCStack -lTrkBase -lParBase -lGeoBase -lGeane -lGen -lXMLIO -lMinuit -lGeom -lGeomPainter -lVMC -lEG `root-config --glibs` -lpthread
 
 
 #librunMC.a: $(patsubst %.cxx,%.o,$(wildcard *.cxx))

mpddata/MpdEvent.cxx

@@ -42,4 +42,53 @@ MpdTrack *MpdEvent::AddGlobalTrack()
   return new((*fGlobalTracks)[fEventInfoNofGlobalTracks++]) MpdTrack();
 }
 // -------------------------------------------------------------------
+
+MpdEvent& MpdEvent::operator =(const MpdEvent& event) {
+	if(&event==this){
+		return *this;
+	}
+    fRunInfoRunId = event.fRunInfoRunId;
+    fRunInfo_ProductionVersion = event.fRunInfo_ProductionVersion;
+    fRunInfo_CenterOfMassEnergy = event.fRunInfo_CenterOfMassEnergy;
+    fRunInfo_BeamMassNumber[0] = event.fRunInfo_BeamMassNumber[0];
+    fRunInfo_BeamMassNumber[1] = event.fRunInfo_BeamMassNumber[1];
+    fRunInfoMagneticFieldZ = event.fRunInfoMagneticFieldZ;
+    fEventInfo_TriggerMask = event.fEventInfo_TriggerMask;
+    fEventInfoNofGlobalTracks = event.fEventInfoNofGlobalTracks;
+    fEventInfoNofPrimaryTracks = event.fEventInfoNofPrimaryTracks;
+    fEventInfo_NofPositiveTracks = event.fEventInfo_NofPositiveTracks;
+    fEventInfo_NofNegativeTracks = event.fEventInfo_NofNegativeTracks;
+
+    // PrimaryVertices
+
+    PrimaryVerticesX = event.PrimaryVerticesX;
+    PrimaryVerticesY = event.PrimaryVerticesY;
+    PrimaryVerticesZ = event.PrimaryVerticesZ;
+    PrimaryVerticesXerr = event.PrimaryVerticesXerr;
+    PrimaryVerticesYerr = event.PrimaryVerticesYerr;
+    PrimaryVerticesZerr = event.PrimaryVerticesZerr;
+    PrimaryVertices_SumTrackPt = event.PrimaryVertices_SumTrackPt;
+    PrimaryVertices_MeanDip = event.PrimaryVertices_MeanDip;
+    PrimaryVerticesChi2 = event.PrimaryVerticesChi2;
+    PrimaryVertices_RefMultNeg = event.PrimaryVertices_RefMultNeg;
+    PrimaryVertices_RefMultPos = event.PrimaryVertices_RefMultPos;
+    fPrimaryTracks->Clear();
+    fGlobalTracks->Clear();
+    for(int i=0;i<event.fPrimaryTracks->GetEntriesFast();i++){
+    	MpdTrack *from = (MpdTrack*)event.fPrimaryTracks->UncheckedAt(i);
+    	MpdTrack *to = (MpdTrack*)fPrimaryTracks->ConstructedAt(i);
+    	*to = *from;
+    }
+    for(int i=0;i<event.fGlobalTracks->GetEntriesFast();i++){
+    	MpdTrack *from = (MpdTrack*)event.fGlobalTracks->UncheckedAt(i);
+    	MpdTrack *to = (MpdTrack*)fGlobalTracks->ConstructedAt(i);
+    	*to = *from;
+    }
+    return *this;
+}
+
+// -------------------------------------------------------------------
+
 ClassImp(MpdEvent);
+
+

mpddata/MpdEvent.h

@@ -48,6 +48,7 @@ class MpdEvent : public TNamed {
  public:
  
   MpdEvent(); // Default constructor
+  MpdEvent& operator=(const MpdEvent &event);
   virtual ~MpdEvent(); // Destructor
 
   void Reset();