--- PamelaLevel2/src/PamLevel2.cpp	2015/03/24 09:15:01	1.110
+++ PamelaLevel2/src/PamLevel2.cpp	2015/10/30 09:32:24	1.111
@@ -315,17 +315,34 @@
 
 //   candeleteobj = 0;
 
+//  cout << t<<"--"<<c<<"--"<<o<<"--"<<r<<"--"<< endl;
 
   if (t){
       trk_track = new TrkTrack(*t);
       trk_ext_track = new ExtTrack(*t);//NB!! ha dimensione 6 invece che 8
+  }else{
+      trk_track = new TrkTrack();
+      trk_ext_track = new ExtTrack();
+      
   }
+
   if (c)
     calo_track = new CaloTrkVar(*c);
+  else
+    calo_track = new CaloTrkVar();
+  
   if (o)
     tof_track = new ToFTrkVar(*o);
+  else
+    tof_track = new ToFTrkVar();
+
   if (r)
     orb_track = new OrbitalInfoTrkVar(*r);
+  else
+    orb_track = new OrbitalInfoTrkVar();
+
+//  cout << trk_track<<"--"<< calo_track <<"--"<<tof_track<<"--"<<orb_track<<"--"<< endl;
+
   candeleteobj = 1;
 
 }
@@ -335,6 +352,8 @@
  */
 PamTrack::PamTrack(ExtTrack* t, CaloTrkVar* c, ToFTrkVar* o, OrbitalInfoTrkVar *r) {
 
+    
+
   trk_ext_track = 0;
   trk_track = 0;
   calo_track = 0;
@@ -354,17 +373,32 @@
 
 //   candeleteobj = 0;
 
+//  cout << t<<"--"<<c<<"--"<<o<<"--"<<r<<"--"<< endl;
+
 
   if (t){
 ////      trk_track = new TrkTrack(*t);//in this case TrkTrack object remains null
       trk_ext_track = new ExtTrack(*t);
+  }else{
+      trk_ext_track = new ExtTrack();
   }
   if (c)
     calo_track = new CaloTrkVar(*c);
+  else
+      calo_track = new CaloTrkVar();
+
   if (o)
     tof_track = new ToFTrkVar(*o);
+  else
+    tof_track = new ToFTrkVar();
+
   if (r)
     orb_track = new OrbitalInfoTrkVar(*r);
+  else
+    orb_track = new OrbitalInfoTrkVar();
+
+//  cout << trk_track<<"--"<< calo_track <<"--"<<tof_track<<"--"<<orb_track<<"--"<< endl;
+
   candeleteobj = 1;
   pscore = 0;
   iscore = 0;
@@ -1952,6 +1986,9 @@
     //	cout<<"o "<<cp<<endl;
     //	cout<<"o "<<op<<endl;
 
+//     cout <<"old p:"<< tp<<"--"<<cp<<"--"<<op<<"--"<<rp<<"--"<< endl;
+//     cout <<"old i:"<< ti<<"--"<<ci<<"--"<<oi<<"--"<<ri<<"--"<< endl;
+
     new (ttsorted[i]) PamTrack(tp, cp, op, rp);
     new (ttimage[i]) PamTrack(ti, ci, oi, ri);
 
@@ -1979,6 +2016,8 @@
   issorted = true;
   lastsorted = GetReadEntry();
 
+//  cout <<" SortTracks() -- end"<<endl;
+
 }
 ;
 //
@@ -2142,34 +2181,30 @@
 
       if(doit == 0){
 
-  	  trk2  = trk2_obj;
-	  calo2 = calo2_obj;
-	  tof2  = tof2_obj;
-	  orb2  = orb2_obj;
-      
-	  trkext = trk_ext_obj;
-	  caloext = calo_ext_obj;
-	  tofext = tof_ext_obj;
-	  orbext = orb_ext_obj;
-    
-      
-      
+  	  trk2  = (TRK2 ? trk2_obj: NULL);;
+	  calo2 = (CAL2 ? calo2_obj: NULL);;
+	  tof2  = (TOF  ?tof2_obj: NULL);;
+	  orb2  = (ORB ? orb2_obj: NULL);;
       
+	  trkext = (TRK2 ? trk_ext_obj: NULL);;
+	  caloext = (CAL2 ? calo_ext_obj: NULL);;
+	  tofext = (TOF  ?tof_ext_obj: NULL);;
+	  orbext = (ORB ? orb_ext_obj: NULL);;
 
       }else if (doit == 1){
 
 	  if(!NUC)break;
 
       
-	  trk2  = trk2_nuc_obj;
-	  calo2 = calo2_nuc_obj;
-	  tof2  = tof2_nuc_obj;
-	  orb2  = orb2_nuc_obj;
+	  trk2  = (TRK2 ?trk2_nuc_obj: NULL);;
+	  calo2 = (CAL2 ? calo2_nuc_obj: NULL);;
+	  tof2  = (TOF  ?tof2_nuc_obj: NULL);;
+	  orb2  = (ORB ? orb2_nuc_obj: NULL);;
       
-	  trkext = trk_ext_nuc_obj;
-	  caloext = calo_ext_nuc_obj;
-	  tofext = tof_ext_nuc_obj;
-	  orbext = orb_ext_nuc_obj;
+	  trkext = (TRK2 ?trk_ext_nuc_obj: NULL);;
+	  caloext = (CAL2 ? calo_ext_nuc_obj: NULL);;
+	  tofext = (TOF  ?tof_ext_nuc_obj: NULL);;
+	  orbext = (ORB ? orb_ext_nuc_obj: NULL);;
       
       
       
@@ -2202,10 +2237,12 @@
 	  OrbitalInfoTrkVar *rs = 0;
 
 	  // get tracker tracks
-	  TrkTrack *tp = trk2->GetTrack(i); //tracker
-	  CaloTrkVar *cp = calo2->GetCaloStoredTrack(tp->GetSeqNo());
-	  ToFTrkVar *op = tof2->GetToFStoredTrack(tp->GetSeqNo());
-	  OrbitalInfoTrkVar *rp = orb2->GetOrbitalInfoStoredTrack(tp->GetSeqNo());
+	  TrkTrack *tp          = (TRK2 ? trk2->GetTrack(i): NULL); //tracker
+	  CaloTrkVar *cp        = (CAL2 ? calo2->GetCaloStoredTrack(tp->GetSeqNo()) : NULL);
+	  ToFTrkVar *op         = (TOF  ? tof2->GetToFStoredTrack(tp->GetSeqNo())   : NULL);
+	  OrbitalInfoTrkVar *rp = (ORB ? orb2->GetOrbitalInfoStoredTrack(tp->GetSeqNo()) : NULL);
+
+	  cout << "ORB="<<ORB<<" rp="<<rp<<endl;
 
 	  TrkTrack *ti = 0; //tracker (image)
 	  CaloTrkVar *ci = 0;
@@ -2221,10 +2258,10 @@
 
 	  if (tp->HasImage()) {
 
-	      ti = trk2->GetTrackImage(i); //tracker (image)
-	      ci = calo2->GetCaloStoredTrack(ti->GetSeqNo());
-	      oi = tof2->GetToFStoredTrack(ti->GetSeqNo());
-	      ri = orb2->GetOrbitalInfoStoredTrack(ti->GetSeqNo());
+	      ti = (TRK2 ? trk2->GetTrackImage(i) : NULL); //tracker (image)
+	      ci = (CAL2 ? calo2->GetCaloStoredTrack(ti->GetSeqNo()): NULL);
+	      oi = (TOF  ? tof2->GetToFStoredTrack(ti->GetSeqNo()): NULL);
+	      ri = (ORB ? orb2->GetOrbitalInfoStoredTrack(ti->GetSeqNo()): NULL);
 
 	      //	    cout << "its image "<<i << " "<<hex<< ti <<dec<< endl;
 
@@ -2592,6 +2629,11 @@
 	  //	cout<<"o "<<cp<<endl;
 	  //	cout<<"o "<<op<<endl;
 
+// 	  cout <<"p:"<< tp<<"--"<<cp<<"--"<<op<<"--"<<rp<<"--"<< endl;
+// 	  cout <<"i:"<< ti<<"--"<<ci<<"--"<<oi<<"--"<<ri<<"--"<< endl;
+
+
+
 	  new (ttsorted[i]) PamTrack(tp, cp, op, rp);
 	  new (ttimage[i]) PamTrack(ti, ci, oi, ri);
 
@@ -2615,7 +2657,7 @@
 //   }
 
 
-//       cout << "text "<<doit<<endl;
+      //      cout << "text "<<orbext<<endl;
 
 
       //--------------------------------------------------
@@ -2624,11 +2666,30 @@
       if(EXT){
 	  for(int it=0; it<trkext->GetEntries(); it++){
 	      
-	      new (ttext[it]) PamTrack((ExtTrack*)(*trkext)[it], (CaloTrkVar*)(*caloext)[it], (ToFTrkVar*)(*tofext)[it], (OrbitalInfoTrkVar*)(*orbext)[it]);
+//	      if( 
+// 		  it < caloext->GetEntries() &&
+// 		  it < tofext->GetEntries() &&
+// 		  it < orbext->GetEntries() &&
+//		  true){
+	      
+	      ExtTrack *t = (trkext ?(ExtTrack*)(*trkext)[it]:NULL ); 
+	      CaloTrkVar *c =(caloext ?(CaloTrkVar*)(*caloext)[it]:NULL ); 
+	      ToFTrkVar *o = (tofext ?(ToFTrkVar*)(*tofext)[it]:NULL ); 
+	      OrbitalInfoTrkVar *r =(orbext ?(OrbitalInfoTrkVar*)(*orbext)[it]:NULL ); 
+//	      cout <<"ext:"<< t<<"--"<<c<<"--"<<o<<"--"<<r<<"--"<< endl;
 	      
+	      new (ttext[it]) PamTrack(t, c, o, r);
+// 	      }else{
+// 		  cout << " PamLevel2::SortTracksNew() --> ORRORE E RACCAPRICCIO!!!"<<endl;
+// 		  cout << " trk  ext-tracks = "<<trkext->GetEntries()<<endl;
+// 		  cout << " calo ext-tracks = "<<caloext->GetEntries()<<endl;
+// 		  cout << " tof  ext-tracks = "<<tofext->GetEntries()<<endl;
+// 		  cout << " orb  ext-tracks = "<<orbext->GetEntries()<<endl;
+// 	      }
 	  }
       }
       
+//  cout <<" SortTracksNew() -- end"<<endl;
 
 
   };
@@ -4066,7 +4127,7 @@
     isFragment = false;
     run_tree->GetEntry(irun);
     if (!GetOrbitalInfo())
-      cout << "** WARNING ** missing OrbitalInfo ---> run info might be not correctly updated " << endl;
+	cout << "PamLevel2::UpdateRunInfo(Long64_t "<<iev<<") ** WARNING ** missing OrbitalInfo    ORB="<<ORB << endl;
     if ( fUseDBinRunInfo ){
       if (gltsync)
         delete gltsync; //Emiliano