--- PamelaLevel2/src/PamLevel2.cpp	2006/12/06 11:07:35	1.10
+++ PamelaLevel2/src/PamLevel2.cpp	2006/12/11 17:49:03	1.11
@@ -507,27 +507,29 @@
  * @param detlist String to select trees to be included
  * @return Pointer to a TTree
  */
-TTree *PamLevel2::GetPamTree(TFile *f, TString detlist="+ALL"){
+TTree *PamLevel2::GetPamTree(TFile *f, TString detlist ){
 
-//	cout << "WARNING!!! -- obsolete method -- \n";
-//	cout << "better use TChain *PamLevel2::GetPamTree(TList*, TString) \n";
+    if( !detlist.IsNull() ) SetWhichTrees(detlist);
+    else                    GetWhichTrees(f);
 
-    SetWhichTrees(detlist);
     TTree *Trout =0;
 
-
     TString fname = f->GetName();
     if(!CheckLevel2File(fname))return NULL;
 
-    
+    UInt_t *found=0;    
+
 // Tracker
     TTree *T = (TTree*)f->Get("Tracker");
     if(T && (TRK2||TRK1||TRKh)) {
 	if(TRK2)T->SetBranchAddress("TrkLevel2", GetPointerTo("TrkLevel2"));
+	else    T->SetBranchStatus("TrkLevel2",0,found);
 	if(TRK2)cout << "Tracker      : set branch address TrkLevel2"<<endl;
 	if(TRK1)T->SetBranchAddress("TrkLevel1", GetPointerTo("TrkLevel1"));
+	else    T->SetBranchStatus("TrkLevel1",0,found);
 	if(TRK1)cout << "Tracker      : set branch address TrkLevel1"<<endl;
  	if(TRKh)T->SetBranchAddress("TrkHough", GetPointerTo("TrkHough"));
+	else    T->SetBranchStatus("TrkHough",0,found);
  	if(TRKh)cout << "Tracker      : set branch address TrkHough"<<endl;
         if(!Trout)Trout=T;
         else Trout->AddFriend(T);
@@ -538,8 +540,10 @@
     TTree *C = (TTree*)f->Get("Calorimeter");
     if(C && (CAL2||CAL1)) {
         if(CAL2)C->SetBranchAddress("CaloLevel2", GetPointerTo("CaloLevel2"));
+	else    C->SetBranchStatus("CaloLevel2",0,found);
         if(CAL2)cout << "Calorimeter  : set branch address CaloLevel2"<<endl;
         if(CAL1)C->SetBranchAddress("CaloLevel1", GetPointerTo("CaloLevel1"));
+	else    C->SetBranchStatus("CaloLevel1",0,found);
         if(CAL1)cout << "Calorimeter  : set branch address CaloLevel1"<<endl;
         if(!Trout)Trout=C;
         else Trout->AddFriend(C);
@@ -597,19 +601,19 @@
         cout << "Anticounter  : missing tree"<<endl;
     };
     // Orbital Info
-	TTree *B = (TTree*)f->Get("OrbitalInfo");
-	if(B && ORB) {
-		B->SetBranchAddress("OrbitalInfo", GetPointerTo("OrbitalInfo"));
-		cout << "OrbitalInfo  : set branch address OrbitalInfo"<<endl;
-		if(!Trout)Trout=O;
-		else Trout->AddFriend(B);
-	}else{
-		cout << "OrbitalInfo  : missing tree"<<endl;
-	};
+    TTree *B = (TTree*)f->Get("OrbitalInfo");
+    if(B && ORB) {
+	B->SetBranchAddress("OrbitalInfo", GetPointerTo("OrbitalInfo"));
+	cout << "OrbitalInfo  : set branch address OrbitalInfo"<<endl;
+	if(!Trout)Trout=O;
+	else Trout->AddFriend(B);
+    }else{
+	cout << "OrbitalInfo  : missing tree"<<endl;
+    };
+    
+    cout<<endl<<" Number of entries: "<<Trout->GetEntries()<<endl<<endl;
     
-	cout<<endl<<" Number of entries: "<<Trout->GetEntries()<<endl<<endl;
-		
-	return Trout;
+    return Trout;
     
 }
 //--------------------------------------
@@ -639,12 +643,17 @@
     // if no input file list is given:	
     if ( flisttxt != "" ){
 	
-	if( !gSystem->IsFileInIncludePath(flisttxt,&fullpath) )return 0;
-	
+	if( !gSystem->IsFileInIncludePath(flisttxt,&fullpath) ){ 
+	    cout <<"File "<<flisttxt<<" not found"<<endl;
+	    return 0;
+	}	
 //		flisttxt = gSystem->ConcatFileName(gSystem->DirName(flisttxt),gSystem->BaseName(flisttxt));
 	flisttxt = fullpath;
 	
-	if( !gSystem->ChangeDirectory(ddir) )return 0; 
+	if( !gSystem->ChangeDirectory(ddir) ){
+	    cout << "Cannot change directory : "<<ddir<<endl;
+	    return 0; 
+	}
 	
 	cout <<"Input file list : " << flisttxt <<endl;
 	ifstream in; 
@@ -717,15 +726,12 @@
  * @param detlist String to select trees to be included
  * @return Pointer to a TChain
  */
-TChain *PamLevel2::GetPamTree(TList *fl, TString detlist="+ALL"){
-
-//	TChain *Tout=0;
-//    if(Tout)Tout->Delete();
-//    Tout = NULL;
+TChain *PamLevel2::GetPamTree(TList *fl, TString detlist ){
     
-    TChain *Tout =0;
+    TChain *Trout =0;
 
-    SetWhichTrees(detlist);
+    if( !detlist.IsNull() )SetWhichTrees(detlist);
+    
     
     TChain *T = 0;	
     TChain *C = 0;
@@ -737,81 +743,168 @@
     TChain *B = 0;
     
     if(TRK2||TRK1||TRKh) T = new TChain("Tracker");	
-    if(CAL2||CAL1) C = new TChain("Calorimeter");
-    if(TOF) O = new TChain("ToF");
-    if(TRG) R = new TChain("Trigger");
-    if(S4)  S = new TChain("S4");
-    if(ND)  N = new TChain("NeutronD");
-    if(AC)  A = new TChain("Anticounter");
-    if(ORB) B = new TChain("OrbitalInfo");
+    if(CAL2||CAL1)       C = new TChain("Calorimeter");
+    if(TOF)              O = new TChain("ToF");
+    if(TRG)              R = new TChain("Trigger");
+    if(S4)               S = new TChain("S4");
+    if(ND)               N = new TChain("NeutronD");
+    if(AC)               A = new TChain("Anticounter");
+    if(ORB)              B = new TChain("OrbitalInfo");
     
     // loop over files and create chains	
     TIter next(fl);
     TSystemFile *questo = 0;
     while ( (questo = (TSystemFile*) next()) ) {
 	TString name =  questo->GetName();
-//		cout << "File: "<< name << endl;
+//	cout << "File: "<< name << endl;
 	if( CheckLevel2File(name) ){
 	    if(TRK2||TRK1||TRKh) T->Add(name);
-	    if(CAL1||CAL2) C->Add(name);
-	    if(TOF) O->Add(name);
-	    if(TRG) R->Add(name);
-	    if(S4)  S->Add(name);
-	    if(ND)  N->Add(name);
-	    if(AC)  A->Add(name);
-	    if(ORB) B->Add(name);
+	    if(CAL1||CAL2)       C->Add(name);
+	    if(TOF)              O->Add(name);
+	    if(TRG)              R->Add(name);
+	    if(S4)               S->Add(name);
+	    if(ND)               N->Add(name);
+	    if(AC)               A->Add(name);
+	    if(ORB)              B->Add(name);
 	};
     }
     
     cout << "done chain \n";
-    
+
+    UInt_t *found=0;
+// Tracker
+    if(T && (TRK2||TRK1||TRKh)) {
+	if(TRK2)T->SetBranchAddress("TrkLevel2", GetPointerTo("TrkLevel2"));
+	else    T->SetBranchStatus("TrkLevel2",0,found);
+	if(TRK2)cout << "Tracker      : set branch address TrkLevel2"<<endl;
+	if(TRK1)T->SetBranchAddress("TrkLevel1", GetPointerTo("TrkLevel1"));
+	else    T->SetBranchStatus("TrkLevel1",0,found);
+	if(TRK1)cout << "Tracker      : set branch address TrkLevel1"<<endl;
+ 	if(TRKh)T->SetBranchAddress("TrkHough", GetPointerTo("TrkHough"));
+	else    T->SetBranchStatus("TrkHough",0,found);
+ 	if(TRKh)cout << "Tracker      : set branch address TrkHough"<<endl;
+        if(!Trout)Trout=T;
+        else Trout->AddFriend("Tracker");
+    }else{
+        cout << "Tracker      : missing tree"<<endl;
+    };
     // Calorimeter
-    if(CAL2||CAL1) {		
-	if(!Tout)Tout=C;
-	else Tout->AddFriend("Calorimeter");
+    if(C && (CAL2||CAL1)) {
+        if(CAL2)C->SetBranchAddress("CaloLevel2", GetPointerTo("CaloLevel2"));
+	else    C->SetBranchStatus("CaloLevel2",0,found);
+        if(CAL2)cout << "Calorimeter  : set branch address CaloLevel2"<<endl;
+        if(CAL1)C->SetBranchAddress("CaloLevel1", GetPointerTo("CaloLevel1"));
+	else    C->SetBranchStatus("CaloLevel1",0,found);
+        if(CAL1)cout << "Calorimeter  : set branch address CaloLevel1"<<endl;
+        if(!Trout)Trout=C;
+        else Trout->AddFriend("Calorimeter");
+    }else{
+        cout << "Calorimeter  : missing tree"<<endl;
     };
     // ToF    
-    if(TOF) {
-	if(!Tout)Tout=O;
-	else Tout->AddFriend("ToF");
+    if(O && TOF) {
+        O->SetBranchAddress("ToFLevel2", GetPointerTo("ToFLevel2"));
+        cout << "ToF          : set branch address ToFLevel2"<<endl;
+        if(!Trout)Trout=O;
+        else Trout->AddFriend("ToF");
+    }else{
+        cout << "ToF         : missing tree"<<endl;
     };
-    // Tracker
-    if(TRK2||TRK1||TRKh){
-	if(!Tout)Tout=T;
-	else Tout->AddFriend("Tracker");
-    }
     // Trigger
-    if(TRG) {
-	if(!Tout)Tout=R;
-	else Tout->AddFriend("Trigger");
+    if(R && TRG) {
+        R->SetBranchAddress("TrigLevel2", GetPointerTo("TrigLevel2"));
+        cout << "Trigger      : set branch address TrigLevel2"<<endl;
+        if(!Trout)Trout=O;
+        else Trout->AddFriend("Trigger");
+    }else{
+        cout << "Trigger      : missing tree"<<endl;
     };
     // S4
-    if(S4) {
-	if(!Tout)Tout=S;
-	else Tout->AddFriend("S4");
+    if(S && S4) {
+        S->SetBranchAddress("S4Level2", GetPointerTo("S4Level2"));
+        cout << "S4           : set branch address S4Level2"<<endl;
+        if(!Trout)Trout=O;
+        else Trout->AddFriend("S4");
+    }else{
+        cout << "S4           : missing tree"<<endl;
     };
     // Neutron Detector
-    if(ND) {
-	if(!Tout)Tout=N;
-	else Tout->AddFriend("NeutronD");
+    if(N && ND) {
+        N->SetBranchAddress("NDLevel2", GetPointerTo("NDLevel2"));
+        cout << "NeutronD     : set branch address NDLevel2"<<endl;
+        if(!Trout)Trout=O;
+        else Trout->AddFriend("NeutronD");
+    }else{
+        cout << "NeutronD     : missing tree"<<endl;
     };
     // Anticounters
-    if(AC) {
-	if(!Tout)Tout=A;
-	else Tout->AddFriend("Anticounter");
+    if(A && AC) {
+        A->SetBranchAddress("AcLevel2", GetPointerTo("AcLevel2"));
+        cout << "Anticounter  : set branch address AcLevel2"<<endl;
+        if(!Trout)Trout=O;
+        else Trout->AddFriend("Anticounter");
+    }else{
+        cout << "Anticounter  : missing tree"<<endl;
     };
-    // OrbitalInfo
-    if(ORB) {
-	if(!Tout)Tout=B;
-	else Tout->AddFriend("OrbitalInfo");
+    // Orbital Info
+    if(B && ORB) {
+	B->SetBranchAddress("OrbitalInfo", GetPointerTo("OrbitalInfo"));
+	cout << "OrbitalInfo  : set branch address OrbitalInfo"<<endl;
+	if(!Trout)Trout=O;
+	else Trout->AddFriend("OrbitalInfo");
+    }else{
+	cout << "OrbitalInfo  : missing tree"<<endl;
     };
     
+//    cout<<endl<<" Number of entries: "<<Trout->GetEntries()<<endl<<endl;
+
+    
+//     // Tracker
+//     if(TRK2||TRK1||TRKh){
+// 	if(!Tout)Tout=T;
+// 	else Tout->AddFriend("Tracker");
+//     }
+//     // Calorimeter
+//     if(CAL2||CAL1) {		
+// 	if(!Tout)Tout=C;
+// 	else Tout->AddFriend("Calorimeter");
+//     };
+//     // ToF    
+//     if(TOF) {
+// 	if(!Tout)Tout=O;
+// 	else Tout->AddFriend("ToF");
+//     };
+//     // Trigger
+//     if(TRG) {
+// 	if(!Tout)Tout=R;
+// 	else Tout->AddFriend("Trigger");
+//     };
+//     // S4
+//     if(S4) {
+// 	if(!Tout)Tout=S;
+// 	else Tout->AddFriend("S4");
+//     };
+//     // Neutron Detector
+//     if(ND) {
+// 	if(!Tout)Tout=N;
+// 	else Tout->AddFriend("NeutronD");
+//     };
+//     // Anticounters
+//     if(AC) {
+// 	if(!Tout)Tout=A;
+// 	else Tout->AddFriend("Anticounter");
+//     };
+//     // OrbitalInfo
+//     if(ORB) {
+// 	if(!Tout)Tout=B;
+// 	else Tout->AddFriend("OrbitalInfo");
+//     };
+    
 //    cout<<endl<<" Number of entries: "<<Tout->GetEntries()<<endl<<endl;
     
-//    if( Tout->GetEntries() )PamLevel2::SetBranchAddress();
-    if( Tout->GetEntries() )PamLevel2::SetBranchAddress( Tout );
+//    if( Tout->GetEntries() )PamLevel2::SetBranchAddress( Tout );
     
-    return Tout;
+    return Trout;
 }
 
 
@@ -913,7 +1006,7 @@
 
     // Tracker
      if(TRK2) {
-	t->SetBranchAddress("TrkLevel2", this->GetPointerTo("TrkLevel2"));
+	t->SetBranchAddress("TrkLevel2", GetPointerTo("TrkLevel2"));
 	cout << "Tracker      : set branch address TrkLevel2"<<endl;
     };
     if(TRK1) {
@@ -968,30 +1061,6 @@
     
 }
 
-// void* PamLevel2::GetPointerToTrk()  {return &trk2_obj;};
-// void* PamLevel2::GetPointerToTrk(int s){
-//     switch (s) {
-//     case 1:  return &trk1_obj; 
-//     case 2:  return &trk2_obj; 
-//     case 3:  return &trkh_obj; 
-//     default: return 0;
-//     };
-// };
-// void* PamLevel2::GetPointerToCalo() {return &calo2_obj; };
-// void*       GetPointerToCalo(int s){
-//     switch (s) {
-//     case 1:  return &calo1_obj; 
-//     case 2:  return &calo2_obj; 
-//     default: return 0;
-//     };
-// };
-// void*       GetPointerToToF()  {return &tof_obj;  };
-// void*       GetPointerTo("TrigLevel2") {return &trig_obj; };
-// void*       GetPointerTo("S4Level2")   {return &s4_obj;   };
-// void*       GetPointerTo("NDLevel2")   {return &nd_obj;   };
-// void*       GetPointerTo("AcLevel2")   {return &ac_obj;   };
-// void*       GetPointerTo("OrbitalInfo")  {return &orb_obj;  };
-// void*       GetPointerTo("RunInfo")  {return &run_obj;  };
 
 //--------------------------------------
 //
@@ -1118,17 +1187,6 @@
 	TRKh=false;
     }
 //  -------------------------------------------------------------------------
-
-
-    
-//     if( detlist.Contains("-TRK", TString::kIgnoreCase) )TRK2 = false;
-//     else if( detlist.Contains("+TRK", TString::kIgnoreCase) )TRK2 = true;
-    
-//     if( detlist.Contains("-TRK1", TString::kIgnoreCase) )TRK1 = false;
-//     else if( detlist.Contains("+TRK1", TString::kIgnoreCase) )TRK1 = true;
-
-//     if( detlist.Contains("-TRKh", TString::kIgnoreCase) )TRKh = false;
-//     else if( detlist.Contains("+TRKh", TString::kIgnoreCase) )TRKh = true;
     
     if( detlist.Contains("-TRG", TString::kIgnoreCase) )TRG = false;
     else if( detlist.Contains("+TRG", TString::kIgnoreCase) )TRG = true;
@@ -1147,8 +1205,162 @@
     
     if( detlist.Contains("-ORB", TString::kIgnoreCase) )ORB = false;
     else if( detlist.Contains("+ORB", TString::kIgnoreCase) )ORB = true;
+
+    cout<< "Set detector list --> ";
+    if(TRK1)cout<<"TRK1 ";
+    if(TRK2)cout<<"TRK2 ";
+    if(TRKh)cout<<"TRKH ";
+    if(CAL1)cout<<"CAL1 ";
+    if(CAL2)cout<<"CAL2 ";
+    if(TOF)cout<<"TOF ";
+    if(TRG)cout<<"TRG ";
+    if(AC)cout<<"AC ";
+    if(ND)cout<<"ND ";
+    if(S4)cout<<"S4 ";
+    if(ORB)cout<<"ORB ";
+    cout << endl;
     
 };
+
+
+/**
+ * Set tree/branch detector flags from the content of a tree
+ */
+void  PamLevel2::GetWhichTrees(TFile* f){
+	
+
+    // -----------
+    // reset flags
+    // -----------
+    Bool_t CAL1   = false;     
+    Bool_t CAL2   = false;     
+    Bool_t TRK2   = false;     
+    Bool_t TRK1   = false;     
+    Bool_t TRKh   = false;     
+    Bool_t TRG    = false;     
+    Bool_t TOF    = false;     
+    Bool_t S4     = false;    
+    Bool_t ND     = false;    
+    Bool_t AC     = false;     
+    Bool_t ORB    = false;    
+    
+    Bool_t RUN    = false;
+        
+    cout << "Checking file: "<<f->GetName()<<endl;
+    if( !f || f->IsZombie() ){
+	cout << "File: "<< f->GetName() <<" Non valid root file"<< endl; 
+	return;
+    }
+
+    TList *lk = f->GetListOfKeys();
+    TIter next(lk);
+    TKey *key =0;
+
+    Int_t nev = 0;
+
+    while( (key = (TKey*)next()) ){
+	
+	if( !strcmp(key->GetName(),"Run"        ) )RUN = true;
+
+	//=========================================================	
+       	if( !strcmp(key->GetName(),"Trigger"    ) ){ 
+	    TRG = true;
+	    Int_t nevt = ((TTree*)f->Get("Trigger"))->GetEntries();
+	    if( nev && nevt!=nev){
+		cout << "File: "<< f->GetName() <<" Trigger tree has "<<nevt<<" events instead of "<<nev<< endl; 
+		TRG = false;
+	    }else nev=nevt;
+	}
+	//=========================================================	
+	if( !strcmp(key->GetName(),"ToF"        ) ){
+	    TOF = true;
+	    Int_t nevt = ((TTree*)f->Get("ToF"))->GetEntries();
+	    if( nev && nevt!=nev){
+		cout << "File: "<< f->GetName() <<"     ToF tree has "<<nevt<<" events instead of "<<nev<< endl; 
+		TOF = false;
+	    }else nev=nevt;
+	}
+	//=========================================================  
+	if( !strcmp(key->GetName(),"S4"         ) ){
+	    S4 = true;
+	    Int_t nevt = ((TTree*)f->Get("S4"))->GetEntries();
+	    if( nev && nevt!=nev){
+		cout << "File: "<< f->GetName() <<"      S4 tree has "<<nevt<<" events instead of "<<nev<< endl; 
+		S4 = false;
+	    }else nev=nevt;
+	}
+	//=========================================================  
+
+	if( !strcmp(key->GetName(),"NeutronD"   ) ){
+	    ND = true;
+	    Int_t nevt = ((TTree*)f->Get("NeutronD"))->GetEntries();
+	    if( nev && nevt!=nev){
+		cout << "File: "<< f->GetName() <<"NeutronD tree has "<<nevt<<" events instead of "<<nev<< endl; 
+		ND =false;
+	    }else nev=nevt;
+	}	
+        //=========================================================  
+	if( !strcmp(key->GetName(),"Anticounter") ){
+	    AC = true;
+	    Int_t nevt = ((TTree*)f->Get("Anticounter"))->GetEntries();
+	    if( nev && nevt!=nev){
+		cout << "File: "<< f->GetName() <<" Anticounter tree has "<<nevt<<" events instead of "<<nev<< endl; 
+		AC =false;
+	    }else nev=nevt;
+	}
+	//=========================================================  
+	if( !strcmp(key->GetName(),"OrbitalInfo") ){
+	    ORB = true;
+	    Int_t nevt = ((TTree*)f->Get("OrbitalInfo"))->GetEntries();
+	    if( nev && nevt!=nev){
+		cout << "File: "<< f->GetName() <<" OrbitalInfo tree has "<<nevt<<" events instead of "<<nev<< endl; 
+		ORB = false;
+	    }else nev=nevt;
+	}
+	//=========================================================  
+	if( !strcmp(key->GetName(),"Tracker"    ) ){
+	    TTree *T = (TTree*)f->Get("Tracker");
+	    for(Int_t i=0; i<T->GetListOfBranches()->GetEntries(); i++){
+		TString name = T->GetListOfBranches()->At(i)->GetName();
+		if( !name.CompareTo("TrkLevel1") )TRK1=true;
+		if( !name.CompareTo("TrkLevel2") )TRK2=true;
+		if( !name.CompareTo("TrkHough") )TRKh=true;
+	    };	    
+	    Int_t nevt = T->GetEntries();
+	    if( nev && nevt!=nev){
+		cout << "File: "<< f->GetName() <<" Tracker tree has "<<nevt<<" events instead of "<<nev<< endl; 
+		TRK1 = false;
+		TRK2 = false;
+		TRKh = false;
+	    }else nev=nevt;
+	    T->Delete();
+	};
+	//=========================================================  
+	if( !strcmp(key->GetName(),"Calorimeter"    ) ){
+	    TTree *T = (TTree*)f->Get("Calorimeter");
+	    for(Int_t i=0; i<T->GetListOfBranches()->GetEntries(); i++){
+		TString name = T->GetListOfBranches()->At(i)->GetName();
+		if( !name.CompareTo("CaloLevel1") )CAL1=true;
+		if( !name.CompareTo("CaloLevel2") )CAL2=true;
+	    };	   
+	    Int_t nevt = T->GetEntries();
+	    if( nev && nevt!=nev){
+		cout << "File: "<< f->GetName() <<"  Calorimeter tree has "<<nevt<<" events instead of "<<nev<< endl; 
+		CAL1 = false;
+		CAL2 = false;
+	    }else nev=nevt;
+	    T->Delete();
+	};	
+
+    };
+    
+    lk->Delete();
+       
+    return ;
+	
+};
+
+
 //--------------------------------------
 //
 //
@@ -1384,7 +1596,7 @@
 /**
  * Create clone-trees
  */
-void PamLevel2::CreateCloneTrees( TChain *fChain ){
+void PamLevel2::CreateCloneTrees0( TChain *fChain, TFile *ofile ){
 
     cout << "+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+" <<endl;
     cout << "Create clones of PAMELA trees "<<endl;
@@ -1400,10 +1612,12 @@
     TList *li = fChain->GetListOfFriends();
     TIter next(li);
     TFriendElement* T_friend=0;
+    ofile->cd();
     while( (T_friend = (TFriendElement*)next()) ){
 // 	cout<<T_friend->IsA()->GetName()<<" "<<T_friend->GetName()<<hex << T_friend->GetTree() << dec<<endl;
 //	cout<<T_friend->GetTree()->GetName()<< endl;
-	tree_clone[i] = T_friend->GetTree()->CloneTree(0);	
+	tree_clone[i] = T_friend->GetTree()->CloneTree(0);
+	tree_clone[i]->SetAutoSave(1000000);
 	name =  tree_clone[i]->GetName();
 	name.Append("_clone");
 //	tree_clone[i]->SetName(name.Data());
@@ -1415,95 +1629,95 @@
 
 }
 
-// /**
-//  * Create clone-trees
-//  */
-// void PamLevel2::CreateCloneTrees(){
+/**
+ * Create clone-trees
+ */
+void PamLevel2::CreateCloneTrees(TFile *ofile){
 
-//     cout << "+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+" <<endl;
-//     cout << "Create new PAMELA trees "<<endl;
+    ofile->cd();
+
+    cout << "+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+" <<endl;
+    cout << "Create new PAMELA trees "<<endl;
         
-//     if(TRK1||TRK2||TRKh){
-// 	T_clone = new TTree("Tracker_clone","PAMELA tracker level2 data ");	
-// 	if(TRK1) {
-// 	    trk1_clone = new TrkLevel1();
-// 	    T_clone->Branch("TrkLevel1","TrkLevel1", GetPointerTo("TrkLevel1"));
-// 	    T_clone->BranchRef();
-// 	    cout << "Tracker      : branch TrkLevel1"<<endl;
-// 	};
-// 	if(TRK2) {
-// 	    trk2_clone = new TrkLevel2();
-// 	    T_clone->Branch("TrkLevel2", "TrkLevel2",GetPointerTo("TrkLevel2"));
-// 	    cout << "Tracker      : branch TrkLevel2"<<endl;	    
-// 	};
-// 	if(TRKh) {
-// 	    trkh_clone = new TrkHough();
-// 	    T_clone->Branch("TrkHough","TrkHough", GetPointerTo("TrkHough"));
-// 	    cout << "Tracker      : branch TrkHough"<<endl;
-// 	};
-// 	cout << hex << T_clone << dec << endl;
-//     }
+    Int_t i=0;
 
-//     // Calorimeter
-//     if(CAL1||CAL2){
-// 	C_clone = new TTree("Calorimeter_clone","PAMELA calorimeter level2 data ");	
-// 	if(CAL1) {
-// 	    calo1_clone = new CaloLevel1();
-// 	    C_clone->Branch("CaloLevel1", "CaloLevel1", GetPointerTo("CaloLevel1"));
-// 	    cout << "Calorimeter  : branch CaloLevel1"<<endl;
-// 	};
-// 	if(CAL2) {
-// 	    calo2_clone = new CaloLevel2();
-// 	    C_clone->Branch("CaloLevel2","CaloLevel2", GetPointerTo("CaloLevel2"));
-// 	    cout << "Calorimeter  : branch CaloLevel2"<<endl;
-// 	};
-//     }    
+    if(TRK1||TRK2||TRKh){
+	tree_clone[i] = new TTree("Tracker","PAMELA tracker level2 data ");	
+	if(TRK1) {
+	    tree_clone[i]->Branch("TrkLevel1","TrkLevel1", GetPointerTo("TrkLevel1"));
+	    tree_clone[i]->BranchRef();
+	    cout << "Tracker      : branch TrkLevel1"<<endl;
+	};
+	if(TRK2) {
+	    tree_clone[i]->Branch("TrkLevel2", "TrkLevel2",GetPointerTo("TrkLevel2"));
+	    cout << "Tracker      : branch TrkLevel2"<<endl;	    
+	};
+	if(TRKh) {
+	    tree_clone[i]->Branch("TrkHough","TrkHough", GetPointerTo("TrkHough"));
+	    cout << "Tracker      : branch TrkHough"<<endl;
+	};
+	i++;
+    }
 
-//     // ToF    
-//     if(TOF) {
-// 	O_clone = new TTree("ToF_clone","PAMELA ToF level2 data ");	
-// 	tof_clone = new ToFLevel2();
-// 	O_clone->Branch("ToFLevel2","ToFLevel2", GetPointerTo("ToFLevel2"));
-// 	cout << "ToF          : branch ToFLevel2"<<endl;
-//     };
-//     // Trigger
-//     if(TRG) {
-// 	R_clone = new TTree("Trigger_clone","PAMELA trigger level2 data ");	
-// 	trig_clone = new TrigLevel2();
-// 	R_clone->Branch("TrigLevel2","TrigLevel2", GetPointerTo("TrigLevel2"));
-// 	cout << "Trigger      : branch TrigLevel2"<<endl;
-//     };
-//     // S4
-//     if(S4) {
-// 	S_clone = new TTree("S4_clone","PAMELA S4 level2 data ");	
-// 	s4_clone = new S4Level2();
-// 	S_clone->Branch("S4Level2","S4Level2", GetPointerTo("S4Level2"));
-// 	cout << "S4           : branch S4Level2"<<endl;
-//     };
-//     // Neutron Detector
-//     if(ND) {
-// 	N_clone = new TTree("NeutronD_clone","PAMELA neutron detector level2 data ");	
-// 	nd_clone = new NDLevel2();
-// 	N_clone->Branch("NDLevel2","NDLevel2", GetPointerTo("NDLevel2"));
-// 	cout << "NeutronD     : branch NDLevel2"<<endl;
-//     };
-//     // Anticounters
-//     if(AC) {
-// 	A_clone = new TTree("Anticounter_clone","PAMELA anticounter detector level2 data ");	
-// 	ac_clone = new AcLevel2();
-// 	A_clone->Branch("AcLevel2","AcLevel2", GetPointerTo("AcLevel2"));
-// 	cout << "Anticounter  : branch AcLevel2"<<endl;
-//     };
-//     // OrbitalInfo
-//     if(ORB) {
-// 	B_clone = new TTree("OrbitalInfo_clone","PAMELA oribital info  ");	
-// 	orb_clone = new OrbitalInfo();
-// 	B_clone->Branch("OrbitalInfo","OrbitalInfo", GetPointerTo("OrbitalInfo"));
-// 	cout << "OrbitalInfo  : branch OrbitalInfo"<<endl;
-//     };
-//     cout << "+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+" <<endl;
+    // Calorimeter
+    if(CAL1||CAL2){
+	tree_clone[i] = new TTree("Calorimeter","PAMELA calorimeter level2 data ");	
+	if(CAL1) {
+	    tree_clone[i]->Branch("CaloLevel1", "CaloLevel1", GetPointerTo("CaloLevel1"));
+	    cout << "Calorimeter  : branch CaloLevel1"<<endl;
+	};
+	if(CAL2) {
+	    tree_clone[i]->Branch("CaloLevel2","CaloLevel2", GetPointerTo("CaloLevel2"));
+	    cout << "Calorimeter  : branch CaloLevel2"<<endl;
+	};
+	i++;
+    }    
 
-// }
+    // ToF    
+    if(TOF) {
+	tree_clone[i] = new TTree("ToF","PAMELA ToF level2 data ");	
+	tree_clone[i]->Branch("ToFLevel2","ToFLevel2", GetPointerTo("ToFLevel2"));
+	cout << "ToF          : branch ToFLevel2"<<endl;
+	i++;
+    };
+    // Trigger
+    if(TRG) {
+	tree_clone[i] = new TTree("Trigger","PAMELA trigger level2 data ");	
+	tree_clone[i]->Branch("TrigLevel2","TrigLevel2", GetPointerTo("TrigLevel2"));
+	cout << "Trigger      : branch TrigLevel2"<<endl;
+	i++;
+    };
+    // S4
+    if(S4) {
+	tree_clone[i] = new TTree("S4","PAMELA S4 level2 data ");	
+	tree_clone[i]->Branch("S4Level2","S4Level2", GetPointerTo("S4Level2"));
+	cout << "S4           : branch S4Level2"<<endl;
+	i++;
+    };
+    // Neutron Detector
+    if(ND) {
+	tree_clone[i] = new TTree("NeutronD","PAMELA neutron detector level2 data ");	
+	tree_clone[i]->Branch("NDLevel2","NDLevel2", GetPointerTo("NDLevel2"));
+	cout << "NeutronD     : branch NDLevel2"<<endl;
+	i++;
+    };
+    // Anticounters
+    if(AC) {
+	tree_clone[i] = new TTree("Anticounter","PAMELA anticounter detector level2 data ");	
+	tree_clone[i]->Branch("AcLevel2","AcLevel2", GetPointerTo("AcLevel2"));
+	cout << "Anticounter  : branch AcLevel2"<<endl;
+	i++;
+    };
+    // OrbitalInfo
+    if(ORB) {
+	tree_clone[i] = new TTree("OrbitalInfo","PAMELA oribital info  ");	
+	tree_clone[i]->Branch("OrbitalInfo","OrbitalInfo", GetPointerTo("OrbitalInfo"));
+	cout << "OrbitalInfo  : branch OrbitalInfo"<<endl;
+	i++;
+    };
+    cout << "+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+" <<endl;
+
+}
 
 // /**
 //  * Create clone-trees