Save root output, Change Directory structure.

Author: Michael Staib

TrackingAlignment/IterateFDCInternal.py …ingAlignment/Step1/IterateFDCInternal.pyTrackingAlignment/IterateFDCInternal.py renamed to TrackingAlignment/Step1/IterateFDCInternal.py TrackingAlignment/IterateFDCInternal.py renamed to TrackingAlignment/Step1/IterateFDCInternal.py

@@ -37,18 +37,19 @@
    call('hd_root -PPLUGINS=FDC_InternalAlignment %s -PNTHREADS=%i -PEVENTS_TO_KEEP=%i' % (filename, nThreads, nEvents), shell=True)
    call(r'root -l -b -q $HALLD_HOME/src/plugins/Alignment/FDC_InternalAlignment/FitScripts/FitCathodeAlignment.C\(\"hd_root.root\"\)',shell=True)
    call('mv Result.png FDCInternalAlignIterations/Result_Iter%.2i.png' % iter, shell=True)
-   call('mv Result.png FDCInternalAlignIterations/hd_root_Planes_Iter%.2i.png' % iter, shell=True)
+   call('mv hd_root.root FDCInternalAlignIterations/hd_root_Planes_Iter%.2i.root' % iter, shell=True)
    call('ccdb add /FDC/cathode_alignment CathodeAlignment.txt', shell=True)
    call('hd_root -PPLUGINS=FDC_InternalAlignment %s -PNTHREADS=%i -PEVENTS_TO_KEEP=%i' % (filename, nThreads, nEvents), shell=True)
    call(r'root -l -b -q $HALLD_HOME/src/plugins/Alignment/FDC_InternalAlignment/FitScripts/FitCathodeProjections.C\(\"hd_root.root\"\)',shell=True)
    call('ccdb add /FDC/cathode_alignment CathodeAlignment.txt', shell=True)
    call('ccdb add /FDC/strip_pitches_v2 StripPitchesV2.txt',shell=True)
-   call('mv Result.png FDCInternalAlignIterations/hd_root_Projections_Iter%.2i.png' % iter, shell=True)
+   call('mv hd_root.root FDCInternalAlignIterations/hd_root_Projections_Iter%.2i.root' % iter, shell=True)
    call('mv ResultU.png FDCInternalAlignIterations/ResultU_Iter%.2i.png' % iter, shell=True)
    call('mv ResultV.png FDCInternalAlignIterations/ResultV_Iter%.2i.png' % iter, shell=True)
 
 print "======= FINAL ITERATION ======="
 call('hd_root -PPLUGINS=FDC_InternalAlignment %s -PNTHREADS=%i -PEVENTS_TO_KEEP=%i' % (filename, nThreads, nEvents), shell=True)
+call('mv hd_root.root FDCInternalAlignIterations/hd_root_Planes_Iter%.2i.root' % nIterations, shell=True)
 call(r'root -l -b -q $HALLD_HOME/src/plugins/Alignment/FDC_InternalAlignment/FitScripts/FitCathodeAlignment.C\(\"hd_root.root\"\)',shell=True)
 call('ccdb add /FDC/cathode_alignment CathodeAlignment.txt', shell=True)
 call('mv Result.png FDCInternalAlignIterations/Result_Iter%.2i.png' % nIterations, shell=True)